1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 4e08d1cd704d..bb669d32ccd0 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2893,7 +2893,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
             sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
             sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)
                 rw_max = q->limits.io_opt =
-                        logical_to_sectors(sdp, sdkp->opt_xfer_blocks);
+                        sdkp->opt_xfer_blocks * sdp->sector_size;
         else
                 rw_max = BLK_DEF_MAX_SECTORS;
 
@@ -3268,8 +3268,8 @@ static int sd_suspend_common(struct device *dev, bool ignore_stop_errors)
         struct scsi_disk *sdkp = dev_get_drvdata(dev);
         int ret = 0;
 
-        if (!sdkp)
-                return 0;       /* this can happen */
+        if (!sdkp)      /* E.g.: runtime suspend following sd_remove() */
+                return 0;
 
         if (sdkp->WCE && sdkp->media_present) {
                 sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
@@ -3308,6 +3308,9 @@ static int sd_resume(struct device *dev)
 {
         struct scsi_disk *sdkp = dev_get_drvdata(dev);
 
+        if (!sdkp)      /* E.g.: runtime resume at the start of sd_probe() */
+                return 0;
+
         if (!sdkp->device->manage_start_stop)
                 return 0;