diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-16 01:06:43 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-17 23:23:59 -0700 |
| commit | 9605fb48e1998935a5ee70c965f90ad1ac023add (patch) | |
| tree | 3048946e75d25aa88fe4319ce227326e20449d71 | |
| parent | ffd0db97196c1057f09c2ab42dd5b30e94e511d9 (diff) | |
| download | linux-3.10-9605fb48e1998935a5ee70c965f90ad1ac023add.tar.gz linux-3.10-9605fb48e1998935a5ee70c965f90ad1ac023add.tar.bz2 linux-3.10-9605fb48e1998935a5ee70c965f90ad1ac023add.zip | |
Input: atkbd - rely on input core to restore state on resume
Now that input core takes care of restoring state of input devices
upon resume we don't need to do anything special here.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/keyboard/atkbd.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index c9523e48c6a..904d4c9fbf2 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -773,23 +773,6 @@ static int atkbd_select_set(struct atkbd *atkbd, int target_set, int allow_extra static int atkbd_activate(struct atkbd *atkbd) { struct ps2dev *ps2dev = &atkbd->ps2dev; - unsigned char param[1]; - -/* - * Set the LEDs to a defined state. - */ - - param[0] = 0; - if (ps2_command(ps2dev, param, ATKBD_CMD_SETLEDS)) - return -1; - -/* - * Set autorepeat to fastest possible. - */ - - param[0] = 0; - if (ps2_command(ps2dev, param, ATKBD_CMD_SETREP)) - return -1; /* * Enable the keyboard to receive keystrokes. @@ -1158,14 +1141,6 @@ static int atkbd_reconnect(struct serio *serio) return -1; atkbd_activate(atkbd); - -/* - * Restore repeat rate and LEDs (that were reset by atkbd_activate) - * to pre-resume state - */ - if (!atkbd->softrepeat) - atkbd_set_repeat_rate(atkbd); - atkbd_set_leds(atkbd); } atkbd_enable(atkbd); |