diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-10 12:56:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-10 12:56:24 -0700 |
| commit | 2b64c5434d1303646388e748b7add69624a1cfee (patch) | |
| tree | 2eabc8d525d908d672748448457fe6b8fcac33ab | |
| parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
| parent | 83493d7e782d2630f1a55def14a79f0e7c4faac3 (diff) | |
| download | op-kernel-dev-2b64c5434d1303646388e748b7add69624a1cfee.zip op-kernel-dev-2b64c5434d1303646388e748b7add69624a1cfee.tar.gz | |
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixlet from Tejun Heo:
"I merged the two blaclist entries into 'Crucial_CT???M500SSD*'"
* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
libata: use wider match for blacklisting Crucial M500
| -rw-r--r-- | drivers/ata/libata-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 65d3f1b..8cb2522 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4225,8 +4225,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { /* devices that don't properly handle queued TRIM commands */ { "Micron_M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Crucial_CT???M500SSD1", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Crucial_CT???M500SSD3", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, + { "Crucial_CT???M500SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, /* * Some WD SATA-I drives spin up and down erratically when the link |
