diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 09:45:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 09:45:06 +0000 |
| commit | 4542f75889361f995d2afc26e07a1272805280ea (patch) | |
| tree | 7505db5a21a6d6ce074e37499c29b9cd92f53820 /drivers/message/fusion/mptspi.c | |
| parent | 944cdcda15d461c87e6310694bdb8371a88ac7ff (diff) | |
| parent | 5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
| -rw-r--r-- | drivers/message/fusion/mptspi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 5653e505f91f..424f51d1e2ce 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -1422,6 +1422,11 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto out_mptspi_probe; } + /* VMWare emulation doesn't properly implement WRITE_SAME + */ + if (pdev->subsystem_vendor == 0x15AD) + sh->no_write_same = 1; + spin_lock_irqsave(&ioc->FreeQlock, flags); /* Attach the SCSI Host to the IOC structure |