From: Martin K. Petersen Date: Thu, 16 Jul 2015 01:03:23 +0000 (-0400) Subject: libata: Do not blacklist M510DC X-Git-Tag: v3.18.21~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0f0adf9e73f8f8157afc7d587943e70700f2a56;p=thirdparty%2Fkernel%2Fstable.git libata: Do not blacklist M510DC [ Upstream commit 9051bd393cf25e76dfb45409792719a854661500 ] A new Micron drive was just announced, once again recycling the first part of the model string. Add an underscore to the M510/M550 pattern to avoid picking up the new DC drive. Signed-off-by: Martin K. Petersen Cc: Signed-off-by: Tejun Heo Signed-off-by: Sasha Levin --- diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 2247b0c4e9c40..74e18e94bef27 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4230,7 +4230,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "Crucial_CT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, - { "Micron_M5[15]0*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM | + { "Micron_M5[15]0_*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "Crucial_CT*M550*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, },