iSeries: Fix up viotty_ioctl BKL locking fallout
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Aug 2008 00:36:23 +0000 (17:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Aug 2008 00:36:23 +0000 (17:36 -0700)
The bogus code to call into the n_tty layer got removed in commit
8bc5fb6abb670fa9079cd1994f016a39f99698fe ("Remove bogons from the
iSeries console"), but it left a now uninitialized "return ret;" around.

Not that this code has ever even compiled since the BKL pushdown, since
not only is "ret" no longer initialized, it was never actually declared
even originally.

Replace it with a "return -ENOIOCTLCMD"

Pointed-out-by: Paul Mackerras <paulus@samba.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/viocons.c

index f48892ba12f58ad918106485c6a79d3d1ad467a9..7feeb774a10152e29ae13ce0f635403a2f90a65e 100644 (file)
@@ -705,7 +705,7 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
        case KDSKBLED:
                return 0;
        }
-       return ret;
+       return -ENOIOCTLCMD;
 }
 
 /*