diff options
| author | Jassi Brar <jassi.brar@samsung.com> | 2010-09-03 10:36:46 +0900 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-09-08 12:05:02 -0600 |
| commit | c3f139b65585a5f29df47b2302ff8dbd9bdad0b0 (patch) | |
| tree | 8cda25941c59391020440309c1a642eee7943de4 /drivers/spi/spi_s3c64xx.c | |
| parent | 251ee478f2c877a9a80362e094c542fbac7f5651 (diff) | |
| download | lwn-c3f139b65585a5f29df47b2302ff8dbd9bdad0b0.tar.gz lwn-c3f139b65585a5f29df47b2302ff8dbd9bdad0b0.zip | |
spi/s3c64xx: Fix incorrect reuse of 'val' local variable.
Instead of, wrongly, reusing the 'val' variable, use a dedicated
one for reading the status register.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/spi_s3c64xx.c')
| -rw-r--r-- | drivers/spi/spi_s3c64xx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi_s3c64xx.c b/drivers/spi/spi_s3c64xx.c index 240b690a8a6f..ef9dacabe062 100644 --- a/drivers/spi/spi_s3c64xx.c +++ b/drivers/spi/spi_s3c64xx.c @@ -326,10 +326,11 @@ static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd, val = msecs_to_jiffies(ms) + 10; val = wait_for_completion_timeout(&sdd->xfer_completion, val); } else { + u32 status; val = msecs_to_loops(ms); do { - val = readl(regs + S3C64XX_SPI_STATUS); - } while (RX_FIFO_LVL(val, sci) < xfer->len && --val); + status = readl(regs + S3C64XX_SPI_STATUS); + } while (RX_FIFO_LVL(status, sci) < xfer->len && --val); } if (!val) |