This patch moves SPI controller reset out of spin lock.

Signed-off-by: Sowjanya Komatineni <skomatin...@nvidia.com>
---
 drivers/spi/spi-tegra114.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index c60e40cab0a0..d928a2c92a3d 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -974,11 +974,12 @@ static irqreturn_t handle_cpu_based_xfer(struct 
tegra_spi_data *tspi)
                dev_err(tspi->dev, "CpuXfer 0x%08x:0x%08x\n",
                        tspi->command1_reg, tspi->dma_control_reg);
                tegra_spi_flush_fifos(tspi);
+               complete(&tspi->xfer_completion);
+               spin_unlock_irqrestore(&tspi->lock, flags);
                reset_control_assert(tspi->rst);
                udelay(2);
                reset_control_deassert(tspi->rst);
-               complete(&tspi->xfer_completion);
-               goto exit;
+               return IRQ_HANDLED;
        }
 
        if (tspi->cur_direction & DATA_DIR_RX)
@@ -1047,11 +1048,11 @@ static irqreturn_t handle_dma_based_xfer(struct 
tegra_spi_data *tspi)
                dev_err(tspi->dev, "DmaXfer 0x%08x:0x%08x\n",
                        tspi->command1_reg, tspi->dma_control_reg);
                tegra_spi_flush_fifos(tspi);
+               complete(&tspi->xfer_completion);
+               spin_unlock_irqrestore(&tspi->lock, flags);
                reset_control_assert(tspi->rst);
                udelay(2);
                reset_control_deassert(tspi->rst);
-               complete(&tspi->xfer_completion);
-               spin_unlock_irqrestore(&tspi->lock, flags);
                return IRQ_HANDLED;
        }
 
-- 
2.7.4

Reply via email to