diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-07 21:13:36 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-07 21:18:37 +0000 |
| commit | fe83c068612dd1abef8cf6d224b6b0330604a8f1 (patch) | |
| tree | 8cedc33c46bfdaaa469bce040b9b62908f2b7d49 /linux-core | |
| parent | 2ceafcccb77723a464abd51d07e664933e117b6e (diff) | |
Revert "DRM_CONTROL_ALLOW logic was reversed"
This reverts commit 7af1bb874d9b8b1b8760ad200cee587c41c23434.
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 5077f067..7177f171 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); |