commit 99da6d861c659bb1a961b70f50fad268b9ed5a5f
author Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> Mon Mar 19 08:52:17 2007 +1100
committer Dave Airlie <airlied@linux.ie> Mon Mar 19 08:52:17 2007 +1100
tree aaa921d73006211ccfce0d9ae1bea55d8cb5e214
parent 6244270ef62203e057191bf85489e2ff91cc0e60

drm: allow for more generic drm ioctls

Signed-off-by: Dave Airlie <airlied@linux.ie>

drivers/char/drm/drm_drv.c

diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index f5b9b24..26bec30 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -496,11 +496,14 @@
 		  (long)old_encode_dev(priv->head->device),
 		  priv->authenticated);
 
-	if (nr < DRIVER_IOCTL_COUNT)
-		ioctl = &drm_ioctls[nr];
-	else if ((nr >= DRM_COMMAND_BASE)
+	if ((nr >= DRIVER_IOCTL_COUNT) &&
+	    ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))
+		goto err_i1;
+	if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
 		 && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))
 		ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
+	else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE))
+		ioctl = &drm_ioctls[nr];
 	else
 		goto err_i1;