From f349d84973f205a3dc6ba070b5932a9fa98733ef Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@parisc-linux.org>
Date: Thu, 30 Mar 2006 11:47:32 -0500
Subject: [PATCH] --- yaml --- r: 24831 b: refs/heads/master c:
 cd7a9202a5a6e7712df2b80ed5ebd7b078130fc3 h: refs/heads/master i:   24829:
 c7ff1d1ac349ee360a11803e65f6c4d7399ead4f   24827:
 d50d6b0c2cdab4b4380b11232cba9619f9fc3d7b   24823:
 8de0fbf4ebcced84493c86e145b0549f41372e3a   24815:
 b6573a19f363a0dd4d06ac0cc066bfd92f669b6d   24799:
 814f99f7be8b3275b26516698f1fe4e7664d22e6   24767:
 c85b1d510f6086cfd95316f9d0731c949238fd01   24703:
 dd5f326b9123a2e53c4a86ca1474b9c130fe4cea   24575:
 9c716ca855cb7c4f56bde62a7b8bf5ba7306ece1 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/input/keyboard/hil_kbd.c | 3 +--
 trunk/drivers/input/keyboard/hilkbd.c  | 1 -
 trunk/drivers/input/mouse/hil_ptr.c    | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 620faf7e53cf..66e731e0b701 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4da9f131a74d12de56c44da6d522a9116da06805
+refs/heads/master: cd7a9202a5a6e7712df2b80ed5ebd7b078130fc3
diff --git a/trunk/drivers/input/keyboard/hil_kbd.c b/trunk/drivers/input/keyboard/hil_kbd.c
index 99f8c5b4cd50..63f387e4b783 100644
--- a/trunk/drivers/input/keyboard/hil_kbd.c
+++ b/trunk/drivers/input/keyboard/hil_kbd.c
@@ -240,9 +240,8 @@ static void hil_kbd_disconnect(struct serio *serio)
 		return;
 	}
 
-	input_unregister_device(kbd->dev);
 	serio_close(serio);
-	input_free_device(kbd->dev);
+	input_unregister_device(kbd->dev);
 	kfree(kbd);
 }
 
diff --git a/trunk/drivers/input/keyboard/hilkbd.c b/trunk/drivers/input/keyboard/hilkbd.c
index 452c5f3e6129..33edd030aa75 100644
--- a/trunk/drivers/input/keyboard/hilkbd.c
+++ b/trunk/drivers/input/keyboard/hilkbd.c
@@ -334,7 +334,6 @@ static void __exit hil_exit(void)
 
 	input_unregister_device(hil_dev.dev);
 
-	input_free_device(hil_dev.dev);
 	hil_dev.dev = NULL;
 
 #if defined(CONFIG_PARISC)
diff --git a/trunk/drivers/input/mouse/hil_ptr.c b/trunk/drivers/input/mouse/hil_ptr.c
index a648f9fe3d95..bfb564fd8fe2 100644
--- a/trunk/drivers/input/mouse/hil_ptr.c
+++ b/trunk/drivers/input/mouse/hil_ptr.c
@@ -233,9 +233,8 @@ static void hil_ptr_disconnect(struct serio *serio)
 		return;
 	}
 
-	input_unregister_device(ptr->dev);
 	serio_close(serio);
-	input_free_device(ptr->dev);
+	input_unregister_device(ptr->dev);
 	kfree(ptr);
 }