diff options
author | Jakub Kicinski <kubakici@wp.pl> | 2015-03-16 19:28:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 17:38:36 -0400 |
commit | 9764e7a0f63bda5664cb985f992002c6eccef641 (patch) | |
tree | da2435a68792611c216e2f8dfee9e255e292aa75 | |
parent | 11b03ea0c1ef1cd2df3e7ea0437a13e2dfb65f60 (diff) |
sc16is7xx: don't wipe out port configuration on shutdown
EFCR register contains RS-485 configuration which should not
be changed by shutdown. Instead of doing a write only update
the appropriate bits.
Signed-off-by: Jakub Kicinski <kubakici@wp.pl>
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/sc16is7xx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 11bb44039a57..e6b396e584f3 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c | |||
@@ -903,9 +903,11 @@ static void sc16is7xx_shutdown(struct uart_port *port) | |||
903 | /* Disable all interrupts */ | 903 | /* Disable all interrupts */ |
904 | sc16is7xx_port_write(port, SC16IS7XX_IER_REG, 0); | 904 | sc16is7xx_port_write(port, SC16IS7XX_IER_REG, 0); |
905 | /* Disable TX/RX */ | 905 | /* Disable TX/RX */ |
906 | sc16is7xx_port_write(port, SC16IS7XX_EFCR_REG, | 906 | sc16is7xx_port_update(port, SC16IS7XX_EFCR_REG, |
907 | SC16IS7XX_EFCR_RXDISABLE_BIT | | 907 | SC16IS7XX_EFCR_RXDISABLE_BIT | |
908 | SC16IS7XX_EFCR_TXDISABLE_BIT); | 908 | SC16IS7XX_EFCR_TXDISABLE_BIT, |
909 | SC16IS7XX_EFCR_RXDISABLE_BIT | | ||
910 | SC16IS7XX_EFCR_TXDISABLE_BIT); | ||
909 | 911 | ||
910 | sc16is7xx_power(port, 0); | 912 | sc16is7xx_power(port, 0); |
911 | } | 913 | } |