aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2006-01-05 23:00:13 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2006-01-05 23:00:13 -0500
commitdbc26344350dff2932902a7723a4e89e71752803 (patch)
treea7a4926ee30979a297628ee0f34b3e86f13df840 /drivers/input
parentfed8bf19ec20efc0641740b2d10aa589dbd6d1ab (diff)
Input: atkbd - don't lose keymap settings when reconnecting keyboard
Call serio_reconnect() instead of serio_rescan() when detecting that a new keyboard was plugged in. This should help KVM uses losing custom keymap settings when switching between boxes. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/atkbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index a0256f8de8ef..ffacf6eca5f5 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -321,7 +321,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
321 switch (code) { 321 switch (code) {
322 case ATKBD_RET_BAT: 322 case ATKBD_RET_BAT:
323 atkbd->enabled = 0; 323 atkbd->enabled = 0;
324 serio_rescan(atkbd->ps2dev.serio); 324 serio_reconnect(atkbd->ps2dev.serio);
325 goto out; 325 goto out;
326 case ATKBD_RET_EMUL0: 326 case ATKBD_RET_EMUL0:
327 atkbd->emul = 1; 327 atkbd->emul = 1;