summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-28 22:02:51 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-28 22:02:51 +0300
commit5e7fec290e41462af28626f8089d08cd4c4aaeab (patch)
tree6b0015402096426fb9b5225444c950f160efe1e6 /drivers
parentb29083c5e52481e8ce6ce0007590f7a1f405018b (diff)
parent7a7184b01aa9deb86df661c6f7cbcf69a95b728c (diff)
downloadlinux-5e7fec290e41462af28626f8089d08cd4c4aaeab.tar.xz
Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixlet from Tejun Heo: "Simple blacklist entry addition" * 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: Add factory recertified Crucial M500s to blacklist
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/libata-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 19bcb80b2031..790e0deb278e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4230,6 +4230,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
ATA_HORKAGE_ZERO_AFTER_TRIM, },
{ "Samsung SSD 8*", NULL, ATA_HORKAGE_NO_NCQ_TRIM |
ATA_HORKAGE_ZERO_AFTER_TRIM, },
+ { "FCCT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM |
+ ATA_HORKAGE_ZERO_AFTER_TRIM, },
/* devices that don't properly handle TRIM commands */
{ "SuperSSpeed S238*", NULL, ATA_HORKAGE_NOTRIM, },