Commit 264ddd07 authored by Emil Velikov's avatar Emil Velikov
Browse files

drm/auth: make drm_{set,drop}master_ioctl symmetrical 



Currently the ret handling is all over the place - with two redundant
assignments and another one addressed earlier.

Use the exact same flow in both functions.

v2: straighten the code flow, instead of just removing the assignments

Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Colin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200530124640.4176323-2-emil.l.velikov@gmail.com
parent 907f5320

drivers/gpu/drm/drm_auth.c

+7 −5
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv) 
int drm_setmaster_ioctl(struct drm_device *dev, void *data,

			struct drm_file *file_priv)

{

	int ret = 0;

	int ret;



	mutex_lock(&dev->master_mutex);
@@ -272,12 +272,15 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, 
	if (ret)

		goto out_unlock;



	if (!drm_is_current_master(file_priv)) {

		ret = -EINVAL;

	if (!drm_is_current_master(file_priv))

		goto out_unlock;

	}



	if (!dev->master)

	if (!dev->master) {

		ret = -EINVAL;

		goto out_unlock;

	}



	if (file_priv->master->lessor != NULL) {

		DRM_DEBUG_LEASE("Attempt to drop lessee %d as master\n", file_priv->master->lessee_id);
@@ -285,7 +288,6 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, 
		goto out_unlock;

	}



	ret = 0;

	drm_drop_master(dev, file_priv);

out_unlock:

	mutex_unlock(&dev->master_mutex);