From ef06616084325cf6b5063d9918bec95e05f46cf7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 20 Jun 2008 15:42:38 +1000 Subject: [PATCH] --- yaml --- r: 98331 b: refs/heads/master c: 858a3685bcf3ac199128e4aa85eaae2fb9d191b5 h: refs/heads/master i: 98329: 7d2631a3ebf8e723d6890982c4af840792eddb91 98327: 54f4c5ec4a652df51963d38d108b256e05dc161c v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_drv.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8dfd603c000a..29bd16f0bbda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3adbc0c582b767ba1561ffa38313e905cc917ea +refs/heads/master: 858a3685bcf3ac199128e4aa85eaae2fb9d191b5 diff --git a/trunk/drivers/char/drm/drm_drv.c b/trunk/drivers/char/drm/drm_drv.c index 22957ac15df4..564138714bb5 100644 --- a/trunk/drivers/char/drm/drm_drv.c +++ b/trunk/drivers/char/drm/drm_drv.c @@ -470,19 +470,18 @@ int drm_ioctl(struct inode *inode, struct file *filp, 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)) + else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) { ioctl = &drm_ioctls[nr]; - else + cmd = ioctl->cmd; + } else goto err_i1; /* Do not trust userspace, use our own definition */ - cmd = ioctl->cmd; func = ioctl->func; /* is there a local override? */ if ((nr == DRM_IOCTL_NR(DRM_IOCTL_DMA)) && dev->driver->dma_ioctl) func = dev->driver->dma_ioctl; - if (!func) { DRM_DEBUG("no function\n"); retcode = -EINVAL;