Merge branch 'misc' into for-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 82910cc69ba38a053d080b4eb1985159c3eb031f..196240dcf26e4c7c2192f78682a40b750e3fd51f 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1203,7 +1203,7 @@ error_autopm:
  *
  *     Locking: called with bdev->bd_mutex held.
  **/
-static int sd_release(struct gendisk *disk, fmode_t mode)
+static void sd_release(struct gendisk *disk, fmode_t mode)
 {
        struct scsi_disk *sdkp = scsi_disk(disk);
        struct scsi_device *sdev = sdkp->device;
@@ -1222,7 +1222,6 @@ static int sd_release(struct gendisk *disk, fmode_t mode)
 
        scsi_autopm_put_device(sdev);
        scsi_disk_put(sdkp);
-       return 0;
 }
 
 static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)