summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-02-05 15:12:46 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2008-02-05 15:12:46 +0000
commit7af1bb874d9b8b1b8760ad200cee587c41c23434 (patch)
treeaefb954dbbc20f7506393dc1775cc016ef1f255f
parent53937a189f8dbe2dd82fb97c0e88454d29a6c7cd (diff)
DRM_CONTROL_ALLOW logic was reversed
-rw-r--r--linux-core/drm_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index b0b44c90..927225f1 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -666,7 +666,7 @@ long drm_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
} else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) ||
((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) ||
((ioctl->flags & DRM_MASTER) && !file_priv->master) ||
- ((!(ioctl->flags & DRM_CONTROL_ALLOW)) && (file_priv->minor->type == DRM_MINOR_CONTROL)) ) {
+ ((ioctl->flags & DRM_CONTROL_ALLOW) && !(file_priv->minor->type == DRM_MINOR_CONTROL)) ) {
retcode = -EACCES;
} else {
retcode = func(dev, kdata, file_priv);