]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm: error out with EBUSY when device has existing master
authorEmil Velikov <emil.velikov@collabora.com>
Thu, 19 Mar 2020 17:29:30 +0000 (17:29 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 30 Mar 2020 11:20:41 +0000 (12:20 +0100)
As requested by Adam, provide different error message for when the
device has an existing master. An audit of the following projects, shows
that the errno is used only for printf() purposes.

xorg/xserver
xorg/drivers/xf86-video-ati
xorg/drivers/xf86-video-amdgpu
xorg/drivers/xf86-video-intel
xorg/drivers/xf86-video-tegra
xorg/drivers/xf86-video-freedreno
xorg/drivers/xf86-video-nouveau
xorg/drivers/xf86-video-vmwgfx

qt/kwin/plasma
gtk/mutter/gnomeshell
efl/enlightment

Cc: Adam Jackson <ajax@redhat.com>
Suggested-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200319172930.230583-2-emil.l.velikov@gmail.com
drivers/gpu/drm/drm_auth.c

index 93c57f08bd937c04815870ce4bf98c180b197f9f..800ac39f3213df4f55304be6bbe5282f9ee3f768 100644 (file)
@@ -245,7 +245,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data,
                goto out_unlock;
 
        if (dev->master) {
-               ret = -EINVAL;
+               ret = -EBUSY;
                goto out_unlock;
        }