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>
This commit is contained in:
parent
5a72afc03c
commit
74af42bb72
1 changed files with 6 additions and 2 deletions
|
@ -215,11 +215,15 @@ static struct pnp_driver i8042_pnp_aux_driver = {
|
||||||
|
|
||||||
static void i8042_pnp_exit(void)
|
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);
|
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);
|
pnp_unregister_driver(&i8042_pnp_aux_driver);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int i8042_pnp_init(void)
|
static int i8042_pnp_init(void)
|
||||||
|
|
Loading…
Reference in a new issue