Commit c9c8dd7d authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ALSA: ua101: Fix unlocked snd_pcm_stop() call

commit 9538aa46 upstream.

snd_pcm_stop() must be called in the PCM substream lock context.
Acked-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bc2f7d6
...@@ -613,14 +613,24 @@ static int start_usb_playback(struct ua101 *ua) ...@@ -613,14 +613,24 @@ static int start_usb_playback(struct ua101 *ua)
static void abort_alsa_capture(struct ua101 *ua) static void abort_alsa_capture(struct ua101 *ua)
{ {
if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states)) unsigned long flags;
if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states)) {
snd_pcm_stream_lock_irqsave(ua->capture.substream, flags);
snd_pcm_stop(ua->capture.substream, SNDRV_PCM_STATE_XRUN); snd_pcm_stop(ua->capture.substream, SNDRV_PCM_STATE_XRUN);
snd_pcm_stream_unlock_irqrestore(ua->capture.substream, flags);
}
} }
static void abort_alsa_playback(struct ua101 *ua) static void abort_alsa_playback(struct ua101 *ua)
{ {
if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states)) unsigned long flags;
if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states)) {
snd_pcm_stream_lock_irqsave(ua->playback.substream, flags);
snd_pcm_stop(ua->playback.substream, SNDRV_PCM_STATE_XRUN); snd_pcm_stop(ua->playback.substream, SNDRV_PCM_STATE_XRUN);
snd_pcm_stream_unlock_irqrestore(ua->playback.substream, flags);
}
} }
static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream, static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment