diff --git a/[refs] b/[refs] index ceecc43448d9..75d6cb50c0c1 100644 --- 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 index c36d110b349a..7d61a9660806 100644 --- 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); }