Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / sg.c

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 7bf54c9a33bb9d958929c5e5cfca2fbd83d33c65..ffc87851f2e86e866616da6a6c0e39ca48dd1910 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1140,7 +1140,6 @@ sg_poll(struct file *filp, poll_table * wait)
 static int
 sg_fasync(int fd, struct file *filp, int mode)
 {
-       int retval;
        Sg_device *sdp;
        Sg_fd *sfp;
 
@@ -1149,8 +1148,7 @@ sg_fasync(int fd, struct file *filp, int mode)
        SCSI_LOG_TIMEOUT(3, printk("sg_fasync: %s, mode=%d\n",
                                   sdp->disk->disk_name, mode));
 
-       retval = fasync_helper(fd, filp, mode, &sfp->async_qp);
-       return (retval < 0) ? retval : 0;
+       return fasync_helper(fd, filp, mode, &sfp->async_qp);
 }
 
 static int