From: James Bottomley <JBottomley@Parallels.com>
Date: Fri, 10 May 2013 14:54:01 +0000 (-0700)
Subject: Merge branch 'postmerge' into for-linus
X-Git-Tag: firefly_0821_release~3680^2~485^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=297b8a07347555f0d2fafa4a1ddfc332d2d4afa9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'postmerge' into for-linus

Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

297b8a07347555f0d2fafa4a1ddfc332d2d4afa9
diff --cc drivers/scsi/sd.c
index 196240dcf26e,5000bec71686..c1c555242d0d
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1220,8 -1199,8 +1214,7 @@@ static void sd_release(struct gendisk *
  	 * XXX is followed by a "rmmod sd_mod"?
  	 */
  
- 	scsi_autopm_put_device(sdev);
  	scsi_disk_put(sdkp);
 -	return 0;
  }
  
  static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)