Skip to content

Commit b5a23a6

Browse files
arndbgregkh
authored andcommitted
serial: amba-pl011: fix build regression
When CONFIG_DMA_ENGINE is disabled, the driver now fails to build: drivers/tty/serial/amba-pl011.c: In function 'pl011_unthrottle_rx': drivers/tty/serial/amba-pl011.c:1822:16: error: 'struct uart_amba_port' has no member named 'using_rx_dma' 1822 | if (uap->using_rx_dma) { | ^~ drivers/tty/serial/amba-pl011.c:1823:20: error: 'struct uart_amba_port' has no member named 'dmacr' 1823 | uap->dmacr |= UART011_RXDMAE; | ^~ drivers/tty/serial/amba-pl011.c:1824:32: error: 'struct uart_amba_port' has no member named 'dmacr' 1824 | pl011_write(uap->dmacr, uap, REG_DMACR); | ^~ Add the missing #ifdef check around these field accesses, matching what other parts of this driver do. Fixes: 2bcacc1 ("serial: amba-pl011: Fix RX stall when DMA is used") Cc: stable <stable@kernel.org> Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202411140617.nkjeHhsK-lkp@intel.com/ Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20241115110021.744332-1-arnd@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 027a4f8 commit b5a23a6

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/tty/serial/amba-pl011.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,10 +1819,12 @@ static void pl011_unthrottle_rx(struct uart_port *port)
18191819

18201820
pl011_write(uap->im, uap, REG_IMSC);
18211821

1822+
#ifdef CONFIG_DMA_ENGINE
18221823
if (uap->using_rx_dma) {
18231824
uap->dmacr |= UART011_RXDMAE;
18241825
pl011_write(uap->dmacr, uap, REG_DMACR);
18251826
}
1827+
#endif
18261828

18271829
uart_port_unlock_irqrestore(&uap->port, flags);
18281830
}

0 commit comments

Comments
 (0)