diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
| commit | a3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch) | |
| tree | 648bbeea304950d02e71863673be8154a5e491f6 /drivers/spi/dw_spi.c | |
| parent | c2de187e5b0f25b572ac1cb6cdf383f16123717d (diff) | |
| parent | ebb47241ea0eac6a5a23404821a2d62f64c68496 (diff) | |
| download | linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.gz linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.bz2 linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/spi/dw_spi.c')
| -rw-r--r-- | drivers/spi/dw_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c index 9a6196461b27..871e337c917f 100644 --- a/drivers/spi/dw_spi.c +++ b/drivers/spi/dw_spi.c @@ -345,7 +345,7 @@ static void int_error_stop(struct dw_spi *dws, const char *msg) void dw_spi_xfer_done(struct dw_spi *dws) { - /* Update total byte transfered return count actual bytes read */ + /* Update total byte transferred return count actual bytes read */ dws->cur_msg->actual_length += dws->len; /* Move to next transfer */ @@ -821,7 +821,7 @@ static int stop_queue(struct dw_spi *dws) spin_lock_irqsave(&dws->lock, flags); dws->run = QUEUE_STOPPED; - while (!list_empty(&dws->queue) && dws->busy && limit--) { + while ((!list_empty(&dws->queue) || dws->busy) && limit--) { spin_unlock_irqrestore(&dws->lock, flags); msleep(10); spin_lock_irqsave(&dws->lock, flags); |