Skip to content

Commit

Permalink
Input: Avoid double unregistering of i8042 PnP driver. This can happen
Browse files Browse the repository at this point in the history
       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>
  • Loading branch information
Kurt Garloff authored and Dmitry Torokhov committed May 28, 2005
1 parent 5a72afc commit 74af42b
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/input/serio/i8042-x86ia64io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 74af42b

Please sign in to comment.