diff --git a/[refs] b/[refs]
index 3f1cd6f74914..150e161c9193 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c03a1dd5bd8a37932ae1d519156172affef22fd
+refs/heads/master: f41649e040b1f63e809fb2adb78ed2f3c3ebbcd0
diff --git a/trunk/drivers/spi/spi_tegra.c b/trunk/drivers/spi/spi_tegra.c
index 0385fde202a6..bb7df02a5472 100644
--- a/trunk/drivers/spi/spi_tegra.c
+++ b/trunk/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);