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

* 'bkl-removal' of git://git.lwn.net/linux-2.6:
  Rationalize fasync return values
  Move FASYNC bit handling to f_op->fasync()
  Use f_lock to protect f_flags
  Rename struct file->f_ep_lock

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 516925d8b570..b4ef2f84ea32 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1154,7 +1154,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;
 
@@ -1163,8 +1162,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