From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Aug 2008 00:36:23 +0000 (-0700)
Subject: iSeries: Fix up viotty_ioctl BKL locking fallout
X-Git-Tag: v2.6.27-rc3~84
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=f99e8f277f1172c49ac7b0585aed5b094fe235d4;p=safe%2Fjmp%2Flinux-2.6

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>
---

diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index f48892b..7feeb77 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;
 }
 
 /*