diff options
| author |   Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 23:00:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 23:00:13 -0500 |
| commit | dbc26344350dff2932902a7723a4e89e71752803 (patch) | |
| tree | a7a4926ee30979a297628ee0f34b3e86f13df840 /drivers/input/keyboard | |
| parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff) | |
| download | linux-dev-dbc26344350dff2932902a7723a4e89e71752803.tar.xz linux-dev-dbc26344350dff2932902a7723a4e89e71752803.zip | |
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/keyboard')
| -rw-r--r-- | drivers/input/keyboard/atkbd.c | 2 |
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, switch (code) { case ATKBD_RET_BAT: atkbd->enabled = 0; - serio_rescan(atkbd->ps2dev.serio); + serio_reconnect(atkbd->ps2dev.serio); goto out; case ATKBD_RET_EMUL0: atkbd->emul = 1; |