projects/linux·commit f41649e0

spi: tegra: fix error setting on timeout

f41649e0 · Erik Gilling <[email protected]> · 2010-09-08 18:16:45 -07:00

avoids derefencing an uninitialized pointer

Change-Id: Icf528441ae481e9f6f5ddc0be32c7c217fa49701
Signed-off-by: Erik Gilling <[email protected]>
Commit
f41649e040b1f63e809fb2adb78ed2f3c3ebbcd0
Parents
0c03a1dd

Changes

1 files changed · +4 −4

FileStatusAddDelContent
drivers/spi/spi_tegra.cmodified+4−4View file

drivers/spi/spi_tegra.c

View file
diff --git a/drivers/spi/spi_tegra.c b/drivers/spi/spi_tegra.c
index 0385fde..bb7df02 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);