diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 17:55:57 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-08-02 22:14:56 +0200 |
| commit | c0a05a14a4e78eba5f3ce15e227d9e805d43909f (patch) | |
| tree | 2c3dac441826e06cc1c7c9291da8de6a000c1b28 /sound | |
| parent | 0501dddbfcb620bdec29e9acbdceb0915d0078cf (diff) | |
ALSA: asihpi: Fix unlocked snd_pcm_stop() call
commit 60478295d6876619f8f47f6d1a5c25eaade69ee3 upstream.
snd_pcm_stop() must be called in the PCM substream lock context.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/asihpi/asihpi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index f4b9e2b7ae87..fbf0bcdf5b59 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c @@ -768,7 +768,10 @@ static void snd_card_asihpi_timer_function(unsigned long data) s->number); ds->drained_count++; if (ds->drained_count > 2) { + unsigned long flags; + snd_pcm_stream_lock_irqsave(s, flags); snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN); + snd_pcm_stream_unlock_irqrestore(s, flags); continue; } } else { |