diff options
| author |   Peter Hurley <peter@hurleysoftware.com> | 2014-11-06 09:06:12 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-06 09:35:54 -0800 |
| commit | 36f339d136f3b6e91235be619a88289a5f980450 (patch) | |
| tree | 7ec6af199a77a273db1424eae3011580cde267f6 /drivers/tty/serial/amba-pl011.c | |
| parent | tty:vt remove obsolete struct initializer (diff) | |
| download | linux-dev-36f339d136f3b6e91235be619a88289a5f980450.tar.xz linux-dev-36f339d136f3b6e91235be619a88289a5f980450.zip | |
serial: pl011: Fix build breakage with !CONFIG_DMA_ENGINE
Commit 479e9b94fdce7bc4 ("serial: Refactor uart_flush_buffer() from
uart_close") refactored the uart_flush_buffer() in uart_close() into
those drivers that define a flush_buffer() method. However, in the
amba-pl011 driver configured without CONFIG_DMA_ENGINE, flush_buffer()
is a NULL method, so the direct call fails to compile.
Check and call the flush_buffer() method through the ops table instead.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/amba-pl011.c')
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 8469b66ff832..83c8f721cdb2 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1689,7 +1689,8 @@ static void pl011_shutdown(struct uart_port *port) plat->exit(); } - pl011_dma_flush_buffer(port); + if (uap->port.ops->flush_buffer) + uap->port.ops->flush_buffer(port); } static void |