From cfb247029d218b3c0c5b90456209dfa10b6d4f76 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Mon, 24 Mar 2008 11:02:06 -0400 Subject: [PATCH] --- yaml --- r: 87959 b: refs/heads/master c: 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d h: refs/heads/master i: 87957: 9d00f0f2d2598f86184f044690c77c5dcb814f0a 87955: ffcd41253ffc22c3a58375eac35424512335b472 87951: 868613769b088ee3b0b36756e37585db7cf9b289 v: v3 --- [refs] | 2 +- trunk/drivers/input/apm-power.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) 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); }