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 f48892ba12f58ad918106485c6a79d3d1ad467a9..7feeb774a10152e29ae13ce0f635403a2f90a65e 100644 (file)
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -705,7 +705,7 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
        case KDSKBLED:
                return 0;
        }
-       return ret;
+       return -ENOIOCTLCMD;
 }
 
 /*