From a5bf8acaffc1e252c34e105c43b6dc3a42743200 Mon Sep 17 00:00:00 2001
From: Kurt Garloff <garloff@suse.de>
Date: Sat, 28 May 2005 02:11:38 -0500
Subject: [PATCH] --- yaml --- r: 1663 b: refs/heads/master c:
 74af42bb729651855f78ea27498250724689130e h: refs/heads/master i:   1661:
 96e9fc89f801ce06196f4dca8fe0520cdd3db97f   1659:
 fed13d770bdcffb4223b81c7006850e297d95b76   1655:
 1f3c5af6175cb25300918258dd9acef74ea822b5   1647:
 1550b49c9cb6ed22e96405b3bf9385f4139552c7   1631:
 ebd34a546b09601f1864c629ab0750f4689ee828   1599:
 0c9bf76477ec51b63e15f56a1120243123ee585e   1535:
 4587caf9727167d85fbe67f7b60481b22a1018b9 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/input/serio/i8042-x86ia64io.h | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4c016499bc98..0ef0a9fb32fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a72afc03ccc29458502cf032f5c34e5ee004ae7
+refs/heads/master: 74af42bb729651855f78ea27498250724689130e
diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h
index 819e47754dab..f4c5f7745422 100644
--- a/trunk/drivers/input/serio/i8042-x86ia64io.h
+++ b/trunk/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)