Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / dv1394.c

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 4c2c02572d21b271b06bbc9fa35b4af458e8145a..823a6297a1afb2241e398f401501d1ee57ad5429 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1325,11 +1325,7 @@ static int dv1394_fasync(int fd, struct file *file, int on)
 
        struct video_card *video = file_to_video_card(file);
 
-       int retval = fasync_helper(fd, file, on, &video->fasync);
-
-       if (retval < 0)
-               return retval;
-        return 0;
+       return fasync_helper(fd, file, on, &video->fasync);
 }
 
 static ssize_t dv1394_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)