X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Finput%2Fapm-power.c;h=7d61a9660806c5a3d30e062ec04dc7344dedc6aa;hb=03b883840c630c7b571690577809754739ac773f;hp=c36d110b349af2d1a5ee8f591c79ccfe7cfbba31;hpb=0b61a2ba5dfd1620731e717d686e6ade657fd975;p=linux-2.6

diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c
index c36d110b34..7d61a96608 100644
--- a/drivers/input/apm-power.c
+++ b/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);
 }