diff options
Diffstat (limited to 'sound/usb/6fire/pcm.c')
-rw-r--r-- | sound/usb/6fire/pcm.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c index ba40489b2de4..36f4115eb1cd 100644 --- a/sound/usb/6fire/pcm.c +++ b/sound/usb/6fire/pcm.c | |||
@@ -679,25 +679,16 @@ int usb6fire_pcm_init(struct sfire_chip *chip) | |||
679 | void usb6fire_pcm_abort(struct sfire_chip *chip) | 679 | void usb6fire_pcm_abort(struct sfire_chip *chip) |
680 | { | 680 | { |
681 | struct pcm_runtime *rt = chip->pcm; | 681 | struct pcm_runtime *rt = chip->pcm; |
682 | unsigned long flags; | ||
683 | int i; | 682 | int i; |
684 | 683 | ||
685 | if (rt) { | 684 | if (rt) { |
686 | rt->panic = true; | 685 | rt->panic = true; |
687 | 686 | ||
688 | if (rt->playback.instance) { | 687 | if (rt->playback.instance) |
689 | snd_pcm_stream_lock_irqsave(rt->playback.instance, flags); | 688 | snd_pcm_stop_xrun(rt->playback.instance); |
690 | snd_pcm_stop(rt->playback.instance, | ||
691 | SNDRV_PCM_STATE_XRUN); | ||
692 | snd_pcm_stream_unlock_irqrestore(rt->playback.instance, flags); | ||
693 | } | ||
694 | 689 | ||
695 | if (rt->capture.instance) { | 690 | if (rt->capture.instance) |
696 | snd_pcm_stream_lock_irqsave(rt->capture.instance, flags); | 691 | snd_pcm_stop_xrun(rt->capture.instance); |
697 | snd_pcm_stop(rt->capture.instance, | ||
698 | SNDRV_PCM_STATE_XRUN); | ||
699 | snd_pcm_stream_unlock_irqrestore(rt->capture.instance, flags); | ||
700 | } | ||
701 | 692 | ||
702 | for (i = 0; i < PCM_N_URBS; i++) { | 693 | for (i = 0; i < PCM_N_URBS; i++) { |
703 | usb_poison_urb(&rt->in_urbs[i].instance); | 694 | usb_poison_urb(&rt->in_urbs[i].instance); |