git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
power_supply: fix dependency of tosa_battery
[safe/jmp/linux-2.6]
/
drivers
/
input
/
apm-power.c
diff --git
a/drivers/input/apm-power.c
b/drivers/input/apm-power.c
index
c36d110
..
7d61a96
100644
(file)
--- 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";
handle->handler = handler;
handle->name = "apm-power";
- handler->private = handle;
-
error = input_register_handle(handle);
if (error) {
printk(KERN_ERR
error = input_register_handle(handle);
if (error) {
printk(KERN_ERR
@@
-87,11
+85,10
@@
static int apmpower_connect(struct input_handler *handler,
return 0;
}
return 0;
}
-static void apmpower_disconnect(struct input_handle *handle
r
)
+static void apmpower_disconnect(struct input_handle *handle)
{
{
- struct input_handle *handle = handler->private;
-
input_close_device(handle);
input_close_device(handle);
+ input_unregister_handle(handle);
kfree(handle);
}
kfree(handle);
}