Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 210633
b: refs/heads/master
c: be7852a
h: refs/heads/master
i:
  210631: 5a7d71e
v: v3
  • Loading branch information
Mark Brown authored and Grant Likely committed Sep 8, 2010
1 parent 61460ca commit b4ec9f6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c3f139b65585a5f29df47b2302ff8dbd9bdad0b0
refs/heads/master: be7852a839b6dcd86db1a2d25b9a1a99f38db2db
6 changes: 6 additions & 0 deletions trunk/drivers/spi/spi_s3c64xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@ static void flush_fifo(struct s3c64xx_spi_driver_data *sdd)
val = readl(regs + S3C64XX_SPI_STATUS);
} while (TX_FIFO_LVL(val, sci) && loops--);

if (loops == 0)
dev_warn(&sdd->pdev->dev, "Timed out flushing TX FIFO\n");

/* Flush RxFIFO*/
loops = msecs_to_loops(1);
do {
Expand All @@ -210,6 +213,9 @@ static void flush_fifo(struct s3c64xx_spi_driver_data *sdd)
break;
} while (loops--);

if (loops == 0)
dev_warn(&sdd->pdev->dev, "Timed out flushing RX FIFO\n");

val = readl(regs + S3C64XX_SPI_CH_CFG);
val &= ~S3C64XX_SPI_CH_SW_RST;
writel(val, regs + S3C64XX_SPI_CH_CFG);
Expand Down

0 comments on commit b4ec9f6

Please sign in to comment.