redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drivers/tty/vt/vt_ioctl.c: repair insane ?: expression 

Cc: Arthur Taylor <art@ified.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
hifive-unleashed-5.1
Andrew Morton 2011-04-07 16:13:01 -07:00 committed by Greg Kroah-Hartman
parent 60680f97d7
commit 6da9e95f73
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/tty/vt/vt_ioctl.c
View File

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