diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-06-12 08:57:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-06-12 08:57:41 +0800 |
| commit | a992366b8fecfb9b4169befeb6489703a4e2f477 (patch) | |
| tree | 19c73dc3c21d928af0bbe7b694be2097da4c88b4 /drivers/ata/libata-core.c | |
| parent | 9dd891c311f5ded8c718120c87c982cade5d2479 (diff) | |
| parent | fce5b5fc495819be9eef7d4d41a9659b2968c7ea (diff) | |
Merge tag 'v3.14.7' into linux-linaro-lsk-v3.14
This is the 3.14.7 stable release
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index bb26636f10c8..62fda16c8377 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4224,10 +4224,10 @@ 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*", "MU0[1-4]*", ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Crucial_CT???M500SSD*", "MU0[1-4]*", ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Micron_M550*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Crucial_CT???M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, + { "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, }, /* * Some WD SATA-I drives spin up and down erratically when the link |