Skip to content

Commit

Permalink
iSeries: Fix up viotty_ioctl BKL locking fallout
Browse files Browse the repository at this point in the history
The bogus code to call into the n_tty layer got removed in commit
8bc5fb6 ("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>
  • Loading branch information
Linus Torvalds committed Aug 7, 2008
1 parent 680db01 commit f99e8f2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/char/viocons.c
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
case KDSKBLED:
return 0;
}
return ret;
return -ENOIOCTLCMD;
}

/*
Expand Down

0 comments on commit f99e8f2

Please sign in to comment.