summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-26 11:03:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-26 11:03:42 -0700
commitf1638fc65ee23875cf4021e342e8a564debe33e4 (patch)
treeaf091401ed9d05c93a9b9545f963fcc566e6d4d9 /drivers/acpi
parent53b4d5911d6adef3f543e1ad23643068c5c343ac (diff)
parenta4a3e061149f09c075f108b6f1cf04d9739a6bc2 (diff)
downloadlinux-f1638fc65ee23875cf4021e342e8a564debe33e4.tar.gz
linux-f1638fc65ee23875cf4021e342e8a564debe33e4.tar.bz2
linux-f1638fc65ee23875cf4021e342e8a564debe33e4.zip
Merge tag 'tty-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver fixes from Greg KH: "Here are some tty and serial driver fixes for 4.11-rc4. One of these fix a long-standing issue in the ldisc code that was found by Dmitry Vyukov with his great fuzzing work. The other fixes resolve other reported issues, and there is one revert of a patch in 4.11-rc1 that wasn't correct. All of these have been in linux-next for a while with no reported issues" * tag 'tty-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: tty: fix data race in tty_ldisc_ref_wait() tty: don't panic on OOM in tty_set_ldisc() Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" tty: acpi/spcr: QDF2400 E44 checks for wrong OEM revision serial: 8250_dw: Fix breakage when HAVE_CLK=n serial: 8250_dw: Honor clk_round_rate errors in dw8250_set_termios
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/spcr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
index 01c94669a2b0..3afa8c1fa127 100644
--- a/drivers/acpi/spcr.c
+++ b/drivers/acpi/spcr.c
@@ -30,7 +30,7 @@ static bool qdf2400_erratum_44_present(struct acpi_table_header *h)
return true;
if (!memcmp(h->oem_table_id, "QDF2400 ", ACPI_OEM_TABLE_ID_SIZE) &&
- h->oem_revision == 0)
+ h->oem_revision == 1)
return true;
return false;