summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2015-06-18 14:50:18 -0400
committerTejun Heo <tj@kernel.org>2015-06-18 14:52:30 -0400
commit243918be6393f643e513a26e7882e6ae06ff7717 (patch)
tree85cefac75193f0cf7cceeffc0bea0e37a1292d65 /drivers/ata
parentd6ecf158148883be1588859c46d6d424513e2e0d (diff)
downloadlinux-stable-243918be6393f643e513a26e7882e6ae06ff7717.tar.gz
linux-stable-243918be6393f643e513a26e7882e6ae06ff7717.tar.bz2
linux-stable-243918be6393f643e513a26e7882e6ae06ff7717.zip
libata: Do not blacklist Micron M500DC
Queued TRIM got disabled on Micron M500DC drives thanks to the "Micron_M500*" pattern we had in place to accommodate the previous generation of this drive family. Tweak the blacklist entry slightly so we only disable queued TRIM for the non-DC variants of M500 drives. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Cc: stable@vger.kernel.org Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 86052e88b65c..0ed3cb8c0f36 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4225,7 +4225,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
{ "PIONEER DVD-RW DVR-216D", NULL, ATA_HORKAGE_NOSETXFER },
/* devices that don't properly handle queued TRIM commands */
- { "Micron_M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM |
+ { "Micron_M500_*", NULL, ATA_HORKAGE_NO_NCQ_TRIM |
ATA_HORKAGE_ZERO_AFTER_TRIM, },
{ "Crucial_CT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM |
ATA_HORKAGE_ZERO_AFTER_TRIM, },