summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-23 11:46:59 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-23 11:46:59 +0900
commita933f80d948e85aa2ac2724a6167d509339fc6b9 (patch)
tree197b08eb94ac60396bc9ec10e2bb51b7f928b6d5
parentea4b3cfa6a328ee87286ea3d4c18929898f76a95 (diff)
parent1488a1e3828d60d74c9b802a05e24c0487babe4e (diff)
downloadlinux-a933f80d948e85aa2ac2724a6167d509339fc6b9.tar.gz
linux-a933f80d948e85aa2ac2724a6167d509339fc6b9.tar.xz
Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fix from Tejun Heo: "Another fallout from max_sectors bump a couple years ago. The lite-on optical drive times out on large requests" * 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: libata: LITE-ON CX1-JB256-HP needs lower max_sectors
-rw-r--r--drivers/ata/libata-core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 6be7770..31c183a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4314,6 +4314,12 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
*/
{ "ST380013AS", "3.20", ATA_HORKAGE_MAX_SEC_1024 },
+ /*
+ * Device times out with higher max sects.
+ * https://bugzilla.kernel.org/show_bug.cgi?id=121671
+ */
+ { "LITEON CX1-JB256-HP", NULL, ATA_HORKAGE_MAX_SEC_1024 },
+
/* Devices we expect to fail diagnostics */
/* Devices where NCQ should be avoided */