Skip to content

Commit 8973ab7

Browse files
tanstafelgregkh
authored andcommitted
serial: 8250: 8250_omap: Clear UART_HAS_RHR_IT_DIS bit
This fixes commit 439c718 ("serial: 8250: 8250_omap: Disable RX interrupt after DMA enable") which unfortunately set the UART_HAS_RHR_IT_DIS bit in the UART_OMAP_IER2 register and never cleared it. Cc: [email protected] Fixes: 439c718 ("serial: 8250: 8250_omap: Disable RX interrupt after DMA enable") Signed-off-by: Ronald Wahl <[email protected]> Reviewed-by: Vignesh Raghavendra <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8e42c30 commit 8973ab7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/tty/serial/8250/8250_omap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ static void __dma_rx_do_complete(struct uart_8250_port *p)
933933
if (priv->habit & UART_HAS_RHR_IT_DIS) {
934934
reg = serial_in(p, UART_OMAP_IER2);
935935
reg &= ~UART_OMAP_IER2_RHR_IT_DIS;
936-
serial_out(p, UART_OMAP_IER2, UART_OMAP_IER2_RHR_IT_DIS);
936+
serial_out(p, UART_OMAP_IER2, reg);
937937
}
938938

939939
dmaengine_tx_status(rxchan, cookie, &state);
@@ -1079,7 +1079,7 @@ static int omap_8250_rx_dma(struct uart_8250_port *p)
10791079
if (priv->habit & UART_HAS_RHR_IT_DIS) {
10801080
reg = serial_in(p, UART_OMAP_IER2);
10811081
reg |= UART_OMAP_IER2_RHR_IT_DIS;
1082-
serial_out(p, UART_OMAP_IER2, UART_OMAP_IER2_RHR_IT_DIS);
1082+
serial_out(p, UART_OMAP_IER2, reg);
10831083
}
10841084

10851085
dma_async_issue_pending(dma->rxchan);

0 commit comments

Comments
 (0)