aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-19 11:26:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-19 11:26:59 -0800
commit9f77a11ab2e5377173d28df93edbc73a02fa06b6 (patch)
treea7c806fd2f846e4dbd4c8a4500e8bd367e1853a2
parent8b335c7d22df5a5c252e4c22559a3f3ae011e3f0 (diff)
parentdb5ff909798ef0099004ad50a0ff5fde92426fd1 (diff)
downloadlinux-4.1-9f77a11ab2e5377173d28df93edbc73a02fa06b6.tar.gz
Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixlet from Tejun Heo: "This just adds one more entry for liteon optical drives to the device blacklist for large IOs. The change is very low risk" * 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: libata: apply MAX_SEC_1024 to all LITEON EP1 series devices
-rw-r--r--drivers/ata/libata-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 8193b38a1cae7a..3c09122bf03825 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4449,6 +4449,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
* https://bugzilla.kernel.org/show_bug.cgi?id=121671
*/
{ "LITEON CX1-JB*-HP", NULL, ATA_HORKAGE_MAX_SEC_1024 },
+ { "LITEON EP1-*", NULL, ATA_HORKAGE_MAX_SEC_1024 },
/* Devices we expect to fail diagnostics */