Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-omap-h63xx.git] / drivers / char / viocons.c

diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 65fb848e1cce0492d908b8dad5f980b6146c05cb..7feeb774a10152e29ae13ce0f635403a2f90a65e 100644 (file)
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -705,11 +705,7 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
        case KDSKBLED:
                return 0;
        }
-       /* FIXME: WTF is this being called for ??? */
-       lock_kernel();
-       ret =  n_tty_ioctl(tty, file, cmd, arg);
-       unlock_kernel();
-       return ret;
+       return -ENOIOCTLCMD;
 }
 
 /*