Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b64c543 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fa389e22 83493d7e

drivers/ata/libata-core.c

+1 −2
Original line number Diff line number Diff line
@@ -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