serial: sirf: Fix compilation failure

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>

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 236f892dab9cc83dd5e5643a1c830c5c3e65e983..1f2be48c92ce70690f8473f7b766ca1055d1feee 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -704,7 +704,7 @@ static void sirfsoc_uart_rx_dma_complete_tl(unsigned long param)
        struct sirfsoc_int_en *uint_en = &sirfport->uart_reg->uart_int_en;
        unsigned long flags;
        struct dma_tx_state tx_state;
-       spin_lock_irqsave(&port->rx_lock, flags);
+       spin_lock_irqsave(&port->lock, flags);
        while (DMA_COMPLETE == dmaengine_tx_status(sirfport->rx_dma_chan,
                        sirfport->rx_dma_items[sirfport->rx_completed].cookie, &tx_state)) {
                sirfsoc_uart_insert_rx_buf_to_tty(sirfport,