---

yaml --- r: 87959 b: refs/heads/master c: 481419e h: refs/heads/master i: 87957: 9d00f0f 87955: ffcd412 87951: 8686137 v: v3
git-mirror · Mar 24, 2008 · cfb2470 · cfb2470
1 parent d350373
commit cfb2470
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 688dad4f4c9004fcaa4cadad167b064342be5d63
+refs/heads/master: 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d
diff --git a/trunk/drivers/input/apm-power.c b/trunk/drivers/input/apm-power.c
@@ -63,8 +63,6 @@ static int apmpower_connect(struct input_handler *handler,
 	handle->handler = handler;
 	handle->name = "apm-power";
 
-	handler->private = handle;
-
 	error = input_register_handle(handle);
 	if (error) {
 		printk(KERN_ERR
@@ -87,11 +85,10 @@ static int apmpower_connect(struct input_handler *handler,
 	return 0;
 }
 
-static void apmpower_disconnect(struct input_handle *handler)
+static void apmpower_disconnect(struct input_handle *handle)
 {
-	struct input_handle *handle = handler->private;
-
 	input_close_device(handle);
+	input_unregister_handle(handle);
 	kfree(handle);
 }