Merge tag 'dt2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / sound / firewire / amdtp.c

diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
index 95fc2ea..3badc70 100644 (file)
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
@@ -1006,11 +1006,7 @@ void amdtp_stream_pcm_abort(struct amdtp_stream *s)
        struct snd_pcm_substream *pcm;
 
        pcm = ACCESS_ONCE(s->pcm);
-       if (pcm) {
-               snd_pcm_stream_lock_irq(pcm);
-               if (snd_pcm_running(pcm))
-                       snd_pcm_stop(pcm, SNDRV_PCM_STATE_XRUN);
-               snd_pcm_stream_unlock_irq(pcm);
-       }
+       if (pcm)
+               snd_pcm_stop_xrun(pcm);
 }
 EXPORT_SYMBOL(amdtp_stream_pcm_abort);