Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-2.6.git] / drivers / hid / usbhid / hiddev.c

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 1f5b5d4c3c34db9844348ba1d27dd900c4166817..aa214170baf414c0b9e1459415dd537be32325a8 100644 (file)
--- 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)
 {
  */
 static int hiddev_fasync(int fd, struct file *file, int on)
 {

-       int retval;

        struct hiddev_list *list = file->private_data;
 
        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);

 }
 
 
 }