diff --git a/[refs] b/[refs] index 9893431d6400..d4b30fabe5f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6cbf3ef4f270c0dfe84b26649e4fc0c25bb0844 +refs/heads/master: e334016fc1735e491385e14157a0360cd85c321b diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c index 1885f369e3e2..c1dbc04cf54a 100644 --- a/trunk/drivers/input/input.c +++ b/trunk/drivers/input/input.c @@ -697,6 +697,8 @@ static int input_handlers_read(char *buf, char **start, off_t pos, int count, in return (count > cnt) ? cnt : count; } +static struct file_operations input_fileops; + static int __init input_proc_init(void) { struct proc_dir_entry *entry; @@ -711,6 +713,8 @@ static int __init input_proc_init(void) return -ENOMEM; } entry->owner = THIS_MODULE; + input_fileops = *entry->proc_fops; + entry->proc_fops = &input_fileops; entry->proc_fops->poll = input_devices_poll; entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL); if (entry == NULL) {