Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b9ab3f7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: 6fire: Fix unlocked snd_pcm_stop() call 



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

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent cc7282b8

sound/usb/6fire/pcm.c

+10 −2
Original line number Diff line number Diff line
@@ -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);