diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-02 16:33:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-02 16:33:51 +0200 |
| commit | 83f2f0ed715eb15a8e13c07df479d65bbc10d8d5 (patch) | |
| tree | e47d7edefa210b328f8cfba43d170fc67d6e0671 /drivers/hid/usbhid | |
| parent | 3de46fda4c104deef17ec70f85361f5c6b84ce0e (diff) | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
Merge branch 'linus' into x86/urgent
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 1f5b5d4c3c3..aa214170baf 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -227,12 +227,9 @@ void hiddev_report_event(struct hid_device *hid, struct hid_report *report) */ static int hiddev_fasync(int fd, struct file *file, int on) { - int retval; struct hiddev_list *list = file->private_data; - retval = fasync_helper(fd, file, on, &list->fasync); - - return retval < 0 ? retval : 0; + return fasync_helper(fd, file, on, &list->fasync); } |