1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 6f0a4c612b3b..4df73e52a4f9 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1899,6 +1899,8 @@ static int sd_try_rc16_first(struct scsi_device *sdp)
 {
         if (sdp->host->max_cmd_len < 16)
                 return 0;
+        if (sdp->try_rc_10_first)
+                return 0;
         if (sdp->scsi_level > SCSI_SPC_2)
                 return 1;
         if (scsi_device_protection(sdp))
@@ -2259,8 +2261,13 @@ bad_sense:
                 sd_printk(KERN_ERR, sdkp, "Asking for cache data failed\n");
 
 defaults:
-        sd_printk(KERN_ERR, sdkp, "Assuming drive cache: write through\n");
-        sdkp->WCE = 0;
+        if (sdp->wce_default_on) {
+                sd_printk(KERN_NOTICE, sdkp, "Assuming drive cache: write back\n");
+                sdkp->WCE = 1;
+        } else {
+                sd_printk(KERN_ERR, sdkp, "Assuming drive cache: write through\n");
+                sdkp->WCE = 0;
+        }
         sdkp->RCD = 0;
         sdkp->DPOFUA = 0;
 }
@@ -2702,6 +2709,7 @@ static int sd_probe(struct device *dev)
         sdkp->disk = gd;
         sdkp->index = index;
         atomic_set(&sdkp->openers, 0);
+        atomic_set(&sdkp->device->ioerr_cnt, 0);
 
         if (!sdp->request_queue->rq_timeout) {
                 if (sdp->type != TYPE_MOD)