From d5208c9adcbbcde74dfe05112cd39fa7c1ebc895 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 19 Dec 2008 12:00:46 +1100
Subject: [PATCH] --- yaml --- r: 123435 b: refs/heads/master c:
 df989374a9f5356ee815baa1ba6916671a701da2 h: refs/heads/master i:   123433:
 d310ac6203b4ef861224ee06035b1f425e11d81c   123431:
 89e0c19aab834c12066e990e79472af71049559a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/gpu/drm/drm_drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 27c199191edb..1b2afa71889e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e74f36d08e83390121d088f1f62e3337603df89
+refs/heads/master: df989374a9f5356ee815baa1ba6916671a701da2
diff --git a/trunk/drivers/gpu/drm/drm_drv.c b/trunk/drivers/gpu/drm/drm_drv.c
index 0b9f3164a3b2..c6e338282588 100644
--- a/trunk/drivers/gpu/drm/drm_drv.c
+++ b/trunk/drivers/gpu/drm/drm_drv.c
@@ -493,7 +493,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
 		retcode = -EINVAL;
 	} 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_MASTER) && !file_priv->is_master)) {
 		retcode = -EACCES;
 	} else {
 		if (cmd & (IOC_IN | IOC_OUT)) {