lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: Don't check for -ENOIOCTLCMD

Browse Source 
unlocked_ioctl() never returns -ENOIOCTLCMD so remove the check.

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Shawn Bohrer
2009-10-18 15:32:17 -05:00
committed by Greg Kroah-Hartman
parent 5d7ae22554
commit a6279bc9e4
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/comedi_compat32.c
View File

@@ -97,12 +97,9 @@ static int translated_ioctl(struct file *file, unsigned int cmd,
if (!file->f_op) if (!file->f_op)
return -ENOTTY; return -ENOTTY;
if (file->f_op->unlocked_ioctl) { if (file->f_op->unlocked_ioctl)
int rc = (int)(*file->f_op->unlocked_ioctl) (file, cmd, arg); return file->f_op->unlocked_ioctl(file, cmd, arg);
if (rc == -ENOIOCTLCMD)
rc = -ENOTTY;
return rc;
}
return -ENOTTY; return -ENOTTY;
} }