From bf5c70c8e2931d18daa3f07ae245a1c23fd4e0e0 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 22 Nov 2007 17:02:08 +1000 Subject: [PATCH] --- yaml --- r: 84027 b: refs/heads/master c: 7ffa05e0518ebc055ef8f68d7d53e5f7d2ba3428 h: refs/heads/master i: 84025: 3e15b087e80433d81d957b76ed42707a462e70e0 84023: 5b471c987ccc140f6817f3260698316bdbbdacd3 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_ioc32.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 956a7f717a25..841e94c3e21b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47a184a80800dd69abd1206eea1b961070ce2ca3 +refs/heads/master: 7ffa05e0518ebc055ef8f68d7d53e5f7d2ba3428 diff --git a/trunk/drivers/char/drm/drm_ioc32.c b/trunk/drivers/char/drm/drm_ioc32.c index 2286f3312c5c..90f5a8d9bdcb 100644 --- a/trunk/drivers/char/drm/drm_ioc32.c +++ b/trunk/drivers/char/drm/drm_ioc32.c @@ -1051,8 +1051,12 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) drm_ioctl_compat_t *fn; int ret; + /* Assume that ioctls without an explicit compat routine will just + * work. This may not always be a good assumption, but it's better + * than always failing. + */ if (nr >= ARRAY_SIZE(drm_compat_ioctls)) - return -ENOTTY; + return drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); fn = drm_compat_ioctls[nr];