diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:26:55 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:26:55 +0000 |
| commit | 962e71f1184a870ada263d81f4b1f9d4eec530ce (patch) | |
| tree | bcc69b5f4609f348fac49e2f59e210b29eaea783 /sound/aoa/soundbus/i2sbus/pcm.c | |
| parent | Adding upstream version 6.9.12. (diff) | |
| download | linux-962e71f1184a870ada263d81f4b1f9d4eec530ce.tar.xz linux-962e71f1184a870ada263d81f4b1f9d4eec530ce.zip | |
Adding upstream version 6.10.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sound/aoa/soundbus/i2sbus/pcm.c')
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/pcm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/aoa/soundbus/i2sbus/pcm.c b/sound/aoa/soundbus/i2sbus/pcm.c index 07df5cc0f2..98b812ffbd 100644 --- a/sound/aoa/soundbus/i2sbus/pcm.c +++ b/sound/aoa/soundbus/i2sbus/pcm.c @@ -255,24 +255,24 @@ static void i2sbus_wait_for_stop(struct i2sbus_dev *i2sdev, { unsigned long flags; DECLARE_COMPLETION_ONSTACK(done); - long timeout; + unsigned long time_left; spin_lock_irqsave(&i2sdev->low_lock, flags); if (pi->dbdma_ring.stopping) { pi->stop_completion = &done; spin_unlock_irqrestore(&i2sdev->low_lock, flags); - timeout = wait_for_completion_timeout(&done, HZ); + time_left = wait_for_completion_timeout(&done, HZ); spin_lock_irqsave(&i2sdev->low_lock, flags); pi->stop_completion = NULL; - if (timeout == 0) { + if (time_left == 0) { /* timeout expired, stop dbdma forcefully */ printk(KERN_ERR "i2sbus_wait_for_stop: timed out\n"); /* make sure RUN, PAUSE and S0 bits are cleared */ out_le32(&pi->dbdma->control, (RUN | PAUSE | 1) << 16); pi->dbdma_ring.stopping = 0; - timeout = 10; + time_left = 10; while (in_le32(&pi->dbdma->status) & ACTIVE) { - if (--timeout <= 0) + if (--time_left <= 0) break; udelay(1); } |