diff options
| author |   Kurt Garloff <garloff@suse.de> | 2005-05-28 02:11:38 -0500 |
|---|---|---|
| committer |   Dmitry Torokhov <dtor_core@ameritech.net> | 2005-05-28 02:11:38 -0500 |
| commit | 74af42bb729651855f78ea27498250724689130e (patch) | |
| tree | 71d4c1894771ddbe1376bb7603c226626c04e57c /drivers/input/serio/i8042-x86ia64io.h | |
| parent | Input: Tone down the severity of a printk() in i386/ia64 arch code (diff) | |
| download | linux-dev-74af42bb729651855f78ea27498250724689130e.tar.xz linux-dev-74af42bb729651855f78ea27498250724689130e.zip | |
Input: Avoid double unregistering of i8042 PnP driver. This can happen
when no i8042 controller (not PnP, not legacy) is present.
From: Kurt Garloff <garloff@suse.de>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042-x86ia64io.h')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 819e47754dab..f4c5f7745422 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -215,11 +215,15 @@ static struct pnp_driver i8042_pnp_aux_driver = { static void i8042_pnp_exit(void) { - if (i8042_pnp_kbd_registered) + if (i8042_pnp_kbd_registered) { + i8042_pnp_kbd_registered = 0; pnp_unregister_driver(&i8042_pnp_kbd_driver); + } - if (i8042_pnp_aux_registered) + if (i8042_pnp_aux_registered) { + i8042_pnp_aux_registered = 0; pnp_unregister_driver(&i8042_pnp_aux_driver); + } } static int i8042_pnp_init(void) |