---

yaml --- r: 175090 b: refs/heads/master c: a6279bc h: refs/heads/master v: v3
git-mirror · Dec 11, 2009 · 9f3d9f8 · 9f3d9f8
1 parent 03565c1
commit 9f3d9f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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;
 }