Merge branch 'akpm' (fixes from Andrew Morton)

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 2c2041ca4b7065402a46820e0e714e6df8f31cba..0cb5c9f0c7431550f633660df8142ddd890f9e7e 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -185,7 +185,7 @@ cache_type_store(struct device *dev, struct device_attribute *attr,
        if (ct < 0)
                return -EINVAL;
        rcd = ct & 0x01 ? 1 : 0;
-       wce = ct & 0x02 ? 1 : 0;
+       wce = (ct & 0x02) && !sdkp->write_prot ? 1 : 0;
 
        if (sdkp->cache_override) {
                sdkp->WCE = wce;
@@ -2490,6 +2490,10 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
                        sdkp->DPOFUA = 0;
                }
 
+               /* No cache flush allowed for write protected devices */
+               if (sdkp->WCE && sdkp->write_prot)
+                       sdkp->WCE = 0;
+
                if (sdkp->first_scan || old_wce != sdkp->WCE ||
                    old_rcd != sdkp->RCD || old_dpofua != sdkp->DPOFUA)
                        sd_printk(KERN_NOTICE, sdkp,
@@ -2961,6 +2965,7 @@ static int sd_probe(struct device *dev)
        int index;
        int error;
 
+       scsi_autopm_get_device(sdp);
        error = -ENODEV;
        if (sdp->type != TYPE_DISK && sdp->type != TYPE_MOD && sdp->type != TYPE_RBC)
                goto out;
@@ -3037,6 +3042,7 @@ static int sd_probe(struct device *dev)
  out_free:
        kfree(sdkp);
  out:
+       scsi_autopm_put_device(sdp);
        return error;
 }