Revert "ecryptfs: replace BUG_ON with error handling code"

[linux-2.6-microblaze.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ed0b1bb..cb3c37d 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1519,7 +1519,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 }
 
 /**
- *     sd_ioctl - process an ioctl
+ *     sd_ioctl_common - process an ioctl
  *     @bdev: target block device
  *     @mode: FMODE_* mask
  *     @cmd: ioctl command number
@@ -1623,6 +1623,7 @@ static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing)
        struct scsi_disk *sdkp = scsi_disk_get(disk);
        struct scsi_device *sdp;
        int retval;
+       bool disk_changed;
 
        if (!sdkp)
                return 0;
@@ -1680,10 +1681,10 @@ out:
         *      Medium present state has changed in either direction.
         *      Device has indicated UNIT_ATTENTION.
         */
-       retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0;
+       disk_changed = sdp->changed;
        sdp->changed = 0;
        scsi_disk_put(sdkp);
-       return retval;
+       return disk_changed ? DISK_EVENT_MEDIA_CHANGE : 0;
 }
 
 static int sd_sync_cache(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr)