diff options
| author | Daniel Thompson <daniel.thompson@linaro.org> | 2014-05-29 11:13:43 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-28 09:12:20 +0200 |
| commit | a2c27add78eb2823f4fc588cc851327f8b5644e1 (patch) | |
| tree | 55c2b5c75cd227bc6644897b057ed904ba0646b6 /drivers/tty | |
| parent | 67aedbd928624d9e7e44c531ae3e2f18f099eb3f (diff) | |
serial: sirf: Fix compilation failure
commit 58eb97c99da6a82c556ddec70683eb3863d4f617 upstream.
After 07d410e0) serial: sirf: fix spinlock deadlock issue it is no longer
possiblet to compile this driver. The rename of one of the spinlocks is
faulty. After looking at the original patch I believe this is the correct
fix.
Compile tested using ARM's multi_v7_defconfig
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Acked-by: Barry Song <baohua@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sirfsoc_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index ef61908cf9c3..25aecf0fa339 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -700,7 +700,7 @@ static void sirfsoc_uart_rx_dma_complete_tl(unsigned long param) struct sirfsoc_uart_port *sirfport = (struct sirfsoc_uart_port *)param; struct uart_port *port = &sirfport->port; unsigned long flags; - spin_lock_irqsave(&port->rx_lock, flags); + spin_lock_irqsave(&port->lock, flags); while (sirfport->rx_completed != sirfport->rx_issued) { sirfsoc_uart_insert_rx_buf_to_tty(sirfport, SIRFSOC_RX_DMA_BUF_SIZE); |