From 9f3d9f8ac71dedf5cfbf4c003c7bd8817c9dae09 Mon Sep 17 00:00:00 2001 From: Shawn Bohrer Date: Sun, 18 Oct 2009 15:32:17 -0500 Subject: [PATCH] --- yaml --- r: 175090 b: refs/heads/master c: a6279bc9e4dfb30bef8e3e1f41df8e877ecd3e30 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_compat32.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2b491599b4a3..29186cfc5128 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d7ae225540a98b6ee7ab1447c6a1eed89c219cd +refs/heads/master: a6279bc9e4dfb30bef8e3e1f41df8e877ecd3e30 diff --git a/trunk/drivers/staging/comedi/comedi_compat32.c b/trunk/drivers/staging/comedi/comedi_compat32.c index 47cf0a1e09cf..a9fdcda5db7a 100644 --- a/trunk/drivers/staging/comedi/comedi_compat32.c +++ b/trunk/drivers/staging/comedi/comedi_compat32.c @@ -97,12 +97,9 @@ static int translated_ioctl(struct file *file, unsigned int cmd, if (!file->f_op) return -ENOTTY; - if (file->f_op->unlocked_ioctl) { - int rc = (int)(*file->f_op->unlocked_ioctl) (file, cmd, arg); - if (rc == -ENOIOCTLCMD) - rc = -ENOTTY; - return rc; - } + if (file->f_op->unlocked_ioctl) + return file->f_op->unlocked_ioctl(file, cmd, arg); + return -ENOTTY; }