From: Erik Gilling <konkers@android.com>
Date: Thu, 9 Sep 2010 01:16:45 +0000 (-0700)
Subject: spi: tegra: fix error setting on timeout
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f41649e040b1f63e809fb2adb78ed2f3c3ebbcd0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

spi: tegra: fix error setting on timeout

avoids derefencing an uninitialized pointer

Change-Id: Icf528441ae481e9f6f5ddc0be32c7c217fa49701
Signed-off-by: Erik Gilling <konkers@android.com>
---

diff --git a/drivers/spi/spi_tegra.c b/drivers/spi/spi_tegra.c
index 0385fde202a6..bb7df02a5472 100644
--- a/drivers/spi/spi_tegra.c
+++ b/drivers/spi/spi_tegra.c
@@ -338,15 +338,15 @@ static void tegra_spi_rx_dma_complete(struct tegra_dma_req *req)
 
 	spin_lock_irqsave(&tspi->lock, flags);
 
-	if (timeout >= 1000)
-		m->status = -EIO;
-
 	val = spi_tegra_readl(tspi, SLINK_STATUS);
 	val |= SLINK_RDY;
 	spi_tegra_writel(tspi, val, SLINK_STATUS);
 
-
 	m = list_first_entry(&tspi->queue, struct spi_message, queue);
+
+	if (timeout >= 1000)
+		m->status = -EIO;
+
 	spi = m->state;
 
 	tspi->cur_pos += spi_tegra_drain_rx_fifo(tspi, tspi->cur);