diff options
| author | Yuki Tsunashima | 2019-07-29 17:10:36 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2019-07-29 19:05:42 +0200 |
| commit | 37151a41df800493cfcbbef4f7208ffe04feb959 (patch) | |
| tree | 8cd5c7dde9e5f8378a4cceff7015c00e155675f6 /sound | |
| parent | ALSA: hda: Fix 1-minute detection delay when i915 module is not available (diff) | |
| download | kernel-qcow2-linux-37151a41df800493cfcbbef4f7208ffe04feb959.tar.gz kernel-qcow2-linux-37151a41df800493cfcbbef4f7208ffe04feb959.tar.xz kernel-qcow2-linux-37151a41df800493cfcbbef4f7208ffe04feb959.zip | |
ALSA: pcm: fix lost wakeup event scenarios in snd_pcm_drain
lost wakeup can occur after enabling irq, therefore put task
into interruptible before enabling interrupts,
without this change, task can be put to sleep and snd_pcm_drain
will delay
Fixes: f2b3614cefb6 ("ALSA: PCM - Don't check DMA time-out too shortly")
Signed-off-by: Yuki Tsunashima <ytsunashima@jp.adit-jv.com>
Signed-off-by: Suresh Udipi <sudipi@jp.adit-jv.com>
[ported from 4.9]
Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_native.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 12dd9b318db1..703857aab00f 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1873,6 +1873,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, if (!to_check) break; /* all drained */ init_waitqueue_entry(&wait, current); + set_current_state(TASK_INTERRUPTIBLE); add_wait_queue(&to_check->sleep, &wait); snd_pcm_stream_unlock_irq(substream); if (runtime->no_period_wakeup) @@ -1885,7 +1886,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, } tout = msecs_to_jiffies(tout * 1000); } - tout = schedule_timeout_interruptible(tout); + tout = schedule_timeout(tout); snd_pcm_stream_lock_irq(substream); group = snd_pcm_stream_group_ref(substream); |