1 files changed, 11 insertions, 3 deletions

diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
index c5b9cac37dc4..3d2551cc10f2 100644
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -543,7 +543,7 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer(
         snd_pcm_uframes_t ret;
 
         if (rt->panic || !sub)
-                return SNDRV_PCM_STATE_XRUN;
+                return SNDRV_PCM_POS_XRUN;
 
         spin_lock_irqsave(&sub->lock, flags);
         ret = sub->dma_off;
@@ -639,17 +639,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);