aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/keyboard/hil_kbd.c3
-rw-r--r--drivers/input/keyboard/hilkbd.c1
-rw-r--r--drivers/input/mouse/hil_ptr.c3
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 99f8c5b4cd50..63f387e4b783 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -240,9 +240,8 @@ static void hil_kbd_disconnect(struct serio *serio)
240 return; 240 return;
241 } 241 }
242 242
243 input_unregister_device(kbd->dev);
244 serio_close(serio); 243 serio_close(serio);
245 input_free_device(kbd->dev); 244 input_unregister_device(kbd->dev);
246 kfree(kbd); 245 kfree(kbd);
247} 246}
248 247
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index 452c5f3e6129..33edd030aa75 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -334,7 +334,6 @@ static void __exit hil_exit(void)
334 334
335 input_unregister_device(hil_dev.dev); 335 input_unregister_device(hil_dev.dev);
336 336
337 input_free_device(hil_dev.dev);
338 hil_dev.dev = NULL; 337 hil_dev.dev = NULL;
339 338
340#if defined(CONFIG_PARISC) 339#if defined(CONFIG_PARISC)
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index a648f9fe3d95..bfb564fd8fe2 100644
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -233,9 +233,8 @@ static void hil_ptr_disconnect(struct serio *serio)
233 return; 233 return;
234 } 234 }
235 235
236 input_unregister_device(ptr->dev);
237 serio_close(serio); 236 serio_close(serio);
238 input_free_device(ptr->dev); 237 input_unregister_device(ptr->dev);
239 kfree(ptr); 238 kfree(ptr);
240} 239}
241 240