Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217182
b: refs/heads/master
c: f41649e
h: refs/heads/master
v: v3
  • Loading branch information
Erik Gilling committed Oct 25, 2010
1 parent ea094aa commit 9261782
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0c03a1dd5bd8a37932ae1d519156172affef22fd
refs/heads/master: f41649e040b1f63e809fb2adb78ed2f3c3ebbcd0
8 changes: 4 additions & 4 deletions trunk/drivers/spi/spi_tegra.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9261782

Please sign in to comment.