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>

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 819e47754dabe3ed2522f7ad3faa9d2d05df5348..f4c5f77454221407f69a42394499bc4ca5153699 100644 (file)
--- 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)