Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[deliverable/linux.git] / sound / usb / usx2y / usbusx2yaudio.c

diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index a63330dd1407e721285285a559c8b90adddd74c5..61d5dc2a342174a2e6f72c5250ff3ddfd20d7b5b 100644 (file)
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -272,13 +272,8 @@ static void usX2Y_clients_stop(struct usX2Ydev *usX2Y)
        for (s = 0; s < 4; s++) {
                struct snd_usX2Y_substream *subs = usX2Y->subs[s];
                if (subs) {
-                       if (atomic_read(&subs->state) >= state_PRERUNNING) {
-                               unsigned long flags;
-
-                               snd_pcm_stream_lock_irqsave(subs->pcm_substream, flags);
-                               snd_pcm_stop(subs->pcm_substream, SNDRV_PCM_STATE_XRUN);
-                               snd_pcm_stream_unlock_irqrestore(subs->pcm_substream, flags);
-                       }
+                       if (atomic_read(&subs->state) >= state_PRERUNNING)
+                               snd_pcm_stop_xrun(subs->pcm_substream);
                        for (u = 0; u < NRURBS; u++) {
                                struct urb *urb = subs->urb[u];
                                if (NULL != urb)