Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[deliverable/linux.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 6f72b80121a02afdc9dda6fc82530af4e16017d9..4df73e52a4f9fb285a886bbe9e313227e9f92c23 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2261,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;
 }
@@ -2704,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)