Commit 2bc2f7d6 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ALSA: 6fire: Fix unlocked snd_pcm_stop() call

commit 5b9ab3f7 upstream.

snd_pcm_stop() must be called in the PCM substream lock context.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 409972c1
...@@ -641,17 +641,25 @@ int usb6fire_pcm_init(struct sfire_chip *chip) ...@@ -641,17 +641,25 @@ int usb6fire_pcm_init(struct sfire_chip *chip)
void usb6fire_pcm_abort(struct sfire_chip *chip) void usb6fire_pcm_abort(struct sfire_chip *chip)
{ {
struct pcm_runtime *rt = chip->pcm; struct pcm_runtime *rt = chip->pcm;
unsigned long flags;
int i; int i;
if (rt) { if (rt) {
rt->panic = true; rt->panic = true;
if (rt->playback.instance) if (rt->playback.instance) {
snd_pcm_stream_lock_irqsave(rt->playback.instance, flags);
snd_pcm_stop(rt->playback.instance, snd_pcm_stop(rt->playback.instance,
SNDRV_PCM_STATE_XRUN); SNDRV_PCM_STATE_XRUN);
if (rt->capture.instance) snd_pcm_stream_unlock_irqrestore(rt->playback.instance, flags);
}
if (rt->capture.instance) {
snd_pcm_stream_lock_irqsave(rt->capture.instance, flags);
snd_pcm_stop(rt->capture.instance, snd_pcm_stop(rt->capture.instance,
SNDRV_PCM_STATE_XRUN); SNDRV_PCM_STATE_XRUN);
snd_pcm_stream_unlock_irqrestore(rt->capture.instance, flags);
}
for (i = 0; i < PCM_N_URBS; i++) { for (i = 0; i < PCM_N_URBS; i++) {
usb_poison_urb(&rt->in_urbs[i].instance); usb_poison_urb(&rt->in_urbs[i].instance);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment