projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: 8250: 8250_omap: Clear UART_HAS_RHR_IT_DIS bit
[platform/kernel/linux-starfive.git]
/
drivers
/
tty
/
serial
/
8250
/
8250_omap.c
diff --git
a/drivers/tty/serial/8250/8250_omap.c
b/drivers/tty/serial/8250/8250_omap.c
index
ca972fd
..
c7ab296
100644
(file)
--- a/
drivers/tty/serial/8250/8250_omap.c
+++ b/
drivers/tty/serial/8250/8250_omap.c
@@
-914,7
+914,7
@@
static void __dma_rx_do_complete(struct uart_8250_port *p)
if (priv->habit & UART_HAS_RHR_IT_DIS) {
reg = serial_in(p, UART_OMAP_IER2);
reg &= ~UART_OMAP_IER2_RHR_IT_DIS;
if (priv->habit & UART_HAS_RHR_IT_DIS) {
reg = serial_in(p, UART_OMAP_IER2);
reg &= ~UART_OMAP_IER2_RHR_IT_DIS;
- serial_out(p, UART_OMAP_IER2,
UART_OMAP_IER2_RHR_IT_DIS
);
+ serial_out(p, UART_OMAP_IER2,
reg
);
}
dmaengine_tx_status(rxchan, cookie, &state);
}
dmaengine_tx_status(rxchan, cookie, &state);
@@
-1060,7
+1060,7
@@
static int omap_8250_rx_dma(struct uart_8250_port *p)
if (priv->habit & UART_HAS_RHR_IT_DIS) {
reg = serial_in(p, UART_OMAP_IER2);
reg |= UART_OMAP_IER2_RHR_IT_DIS;
if (priv->habit & UART_HAS_RHR_IT_DIS) {
reg = serial_in(p, UART_OMAP_IER2);
reg |= UART_OMAP_IER2_RHR_IT_DIS;
- serial_out(p, UART_OMAP_IER2,
UART_OMAP_IER2_RHR_IT_DIS
);
+ serial_out(p, UART_OMAP_IER2,
reg
);
}
dma_async_issue_pending(dma->rxchan);
}
dma_async_issue_pending(dma->rxchan);