Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ef1600 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Dave Airlie
Browse files

drm: drm_stub: Fixing return value if driver master_set call failed 



When dev->driver->master_set() failed ioctl call return 0
but the caller is not the DRM-Master because file_priv->is_master = 0.
Fix that by returning to ioctl caller the driver master_set error code.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent dc021644

drivers/gpu/drm/drm_stub.c

+2 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ EXPORT_SYMBOL(drm_master_put); 
int drm_setmaster_ioctl(struct drm_device *dev, void *data,

			struct drm_file *file_priv)

{

	int ret;

	int ret = 0;



	if (file_priv->is_master)

		return 0;
@@ -229,7 +229,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, 
	}

	mutex_unlock(&dev->struct_mutex);



	return 0;

	return ret;

}



int drm_dropmaster_ioctl(struct drm_device *dev, void *data,