From: James S. <jsi...@us...> - 2002-07-10 20:45:57
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/serio In directory usw-pr-cvs1:/tmp/cvs-serv29027/drivers/input/serio Modified Files: i8042.c Added Files: ct82c710.c parkbd.c rpckbd.c serport.c Log Message: Vojtech's fixes. Index: i8042.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/serio/i8042.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- i8042.c 10 Jul 2002 18:08:04 -0000 1.22 +++ i8042.c 10 Jul 2002 20:45:54 -0000 1.23 @@ -387,14 +387,13 @@ #endif if (i8042_aux_values.exists && (str & I8042_STR_AUXDATA)) { - if (i8042_aux_port.dev) - i8042_aux_port.dev->interrupt(&i8042_aux_port, data, 0); + serio_interrupt(&i8042_aux_port, data, 0); } else { - if (i8042_kbd_values.exists && i8042_kbd_port.dev) { + if (i8042_kbd_values.exists) { if (!i8042_direct) { if (data > 0x7f) { if (test_and_clear_bit(data & 0x7f, i8042_unxlate_seen)) { - i8042_kbd_port.dev->interrupt(&i8042_kbd_port, 0xf0, 0); + serio_interrupt(&i8042_kbd_port, 0xf0, 0); data = i8042_unxlate_table[data & 0x7f]; } } else { @@ -402,7 +401,7 @@ data = i8042_unxlate_table[data]; } } - i8042_kbd_port.dev->interrupt(&i8042_kbd_port, data, 0); + serio_interrupt(&i8042_kbd_port, data, 0); } } } |