Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[~andy/linux] / fs / ioctl.c

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 1d9b9fcb2db48ec682b4e696bbab9dbb79fd26b9..066836e818481fb2240d3cc78062fea3a2cee592 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -42,7 +42,7 @@ static long vfs_ioctl(struct file *filp, unsigned int cmd,
 
        error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
        if (error == -ENOIOCTLCMD)
-               error = -EINVAL;
+               error = -ENOTTY;
  out:
        return error;
 }