ALSA: 6fire: Fix unlocked snd_pcm_stop() call

commit 5b9ab3f7324a1b94a5a5a76d44cf92dfeb3b5e80 upstream.

snd_pcm_stop() must be called in the PCM substream lock context.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 10 insertions, 2 deletions

diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
index 40dd50a80f55..8221ff2f209f 100644
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -641,17 +641,25 @@ int usb6fire_pcm_init(struct sfire_chip *chip)
 void usb6fire_pcm_abort(struct sfire_chip *chip)
 {
         struct pcm_runtime *rt = chip->pcm;
+        unsigned long flags;
         int i;
 
         if (rt) {
                 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,
                                         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,
                                         SNDRV_PCM_STATE_XRUN);
+                        snd_pcm_stream_unlock_irqrestore(rt->capture.instance, flags);
+                }
 
                 for (i = 0; i < PCM_N_URBS; i++) {
                         usb_poison_urb(&rt->in_urbs[i].instance);