diff options
author | Linus Torvalds | 2019-05-31 17:28:44 +0200 |
---|---|---|
committer | Linus Torvalds | 2019-05-31 17:28:44 +0200 |
commit | dbde71df810c62e72e2aa6d88a0686a6092956cd (patch) | |
tree | 31863f62bcfbd03fd9f519535cfbaa71c629c658 /drivers/tty/serial/max310x.c | |
parent | Merge tag 'usb-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
parent | vt/fbcon: deinitialize resources in visual_init() after failed memory allocation (diff) | |
download | kernel-qcow2-linux-dbde71df810c62e72e2aa6d88a0686a6092956cd.tar.gz kernel-qcow2-linux-dbde71df810c62e72e2aa6d88a0686a6092956cd.tar.xz kernel-qcow2-linux-dbde71df810c62e72e2aa6d88a0686a6092956cd.zip |
Merge tag 'tty-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver fixes from Greg KH:
"Here are some small serial and TTY driver fixes for 5.2-rc3.
Nothing major, just a number of fixes for reported issues. The fbcon
core fix also resolves an issue, and was acked by the relevant
maintainer to go through this tree.
All of these have been in linux-next with no reported issues"
* tag 'tty-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
vt/fbcon: deinitialize resources in visual_init() after failed memory allocation
tty: max310x: Fix external crystal register setup
serial: sh-sci: disable DMA for uart_console
serial: imx: remove log spamming error message
tty: serial: msm_serial: Fix XON/XOFF
Diffstat (limited to 'drivers/tty/serial/max310x.c')
-rw-r--r-- | drivers/tty/serial/max310x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 450ba6d7996c..e5aebbf5f302 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -581,7 +581,7 @@ static int max310x_set_ref_clk(struct device *dev, struct max310x_port *s, } /* Configure clock source */ - clksrc = xtal ? MAX310X_CLKSRC_CRYST_BIT : MAX310X_CLKSRC_EXTCLK_BIT; + clksrc = MAX310X_CLKSRC_EXTCLK_BIT | (xtal ? MAX310X_CLKSRC_CRYST_BIT : 0); /* Configure PLL */ if (pllcfg) { |