Skip to content

Commit

Permalink
drivers/tty/vt/vt_ioctl.c: repair insane ?: expression
Browse files Browse the repository at this point in the history
Cc: Arthur Taylor <art@ified.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Andrew Morton authored and Greg Kroah-Hartman committed Apr 19, 2011
1 parent 60680f9 commit 6da9e95
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions drivers/tty/vt/vt_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -698,11 +698,23 @@ int vt_ioctl(struct tty_struct *tty,
break;

case KDGKBMODE:
uival = ((kbd->kbdmode == VC_RAW) ? K_RAW :
(kbd->kbdmode == VC_MEDIUMRAW) ? K_MEDIUMRAW :
(kbd->kbdmode == VC_UNICODE) ? K_UNICODE :
(kbd->kbdmode == VC_OFF) ? K_OFF :
K_XLATE);
switch (kbd->kbdmode) {
case VC_RAW:
uival = K_RAW;
break;
case VC_MEDIUMRAW:
uival = K_MEDIUMRAW;
break;
case VC_UNICODE:
uival = K_UNICODE;
break;
case VC_OFF:
uival = K_OFF;
break;
default:
uival = K_XLATE;
break;
}
goto setint;

/* this could be folded into KDSKBMODE, but for compatibility
Expand Down

0 comments on commit 6da9e95

Please sign in to comment.