diff options
| author | Tejun Heo <tj@kernel.org> | 2014-08-18 17:40:22 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-08-18 17:40:22 -0400 |
| commit | 7dd78d02692d73fa6ee87d40d002f878b3bd00fe (patch) | |
| tree | 939edb434effd7dd825c1443cf42e12caf6d3a38 /drivers/ata | |
| parent | d4473345e611bc5bc5ff07b627de67f5c00ba6a0 (diff) | |
| parent | 2a13772a144d2956a7fedd18685921d0a9b8b783 (diff) | |
Merge branch 'for-3.17-fixes' into for-next
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index dbdc5d32343f..f3e7b9f894cd 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4228,7 +4228,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "Micron_M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, { "Crucial_CT???M500SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, { "Micron_M550*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Crucial_CT???M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, + { "Crucial_CT*M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, /* * Some WD SATA-I drives spin up and down erratically when the link |