---

yaml --- r: 24831 b: refs/heads/master c: cd7a920 h: refs/heads/master i: 24829: c7ff1d1 24827: d50d6b0 24823: 8de0fbf 24815: b6573a1 24799: 814f99f 24767: c85b1d5 24703: dd5f326 24575: 9c716ca v: v3
git-mirror · Mar 30, 2006 · f349d84 · f349d84
1 parent ce907bb
commit f349d84
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);
 }