diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-06 17:36:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-06 17:36:23 -0700 |
| commit | f99e8f277f1172c49ac7b0585aed5b094fe235d4 (patch) | |
| tree | eba6b6cb42ead945ea567d6a29a8c7b7b4669530 | |
| parent | 680db0136e0778a0d7e025af7572c6a8d82279e2 (diff) | |
iSeries: Fix up viotty_ioctl BKL locking fallout
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>
| -rw-r--r-- | drivers/char/viocons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index f48892ba12f5..7feeb774a101 100644 --- 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; } /* |