diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-05-01 09:57:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-05-01 09:57:07 +0200 |
| commit | 19e27ecebe26b233145246c9bd19d6e36348c3fa (patch) | |
| tree | 3cc352070328247debfef26d217a96378449e6d1 | |
| parent | 7a89b403d55df37b9ec039acb900204fa9be1001 (diff) | |
| parent | e7aeb238026c2226e0636e8159f9e71c0c91a84f (diff) | |
| download | sound-19e27ecebe26b233145246c9bd19d6e36348c3fa.tar.gz | |
Merge branch 'for-next'
| -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 07df5cc0f2d7c0..98b812ffbde68e 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); } |