diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 17:58:25 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2013-08-02 22:14:57 +0200 |
commit | a4d0e7c132a92025f7c3dd7cf96bc763799ef2de (patch) | |
tree | 47a981eb8db4cd06b5fbb995ef6bf1dd3da74508 /sound | |
parent | 87b49e0cc4e75c2d1018bc3e74459ba14916ae74 (diff) | |
download | linux-stable-a4d0e7c132a92025f7c3dd7cf96bc763799ef2de.tar.gz linux-stable-a4d0e7c132a92025f7c3dd7cf96bc763799ef2de.tar.bz2 linux-stable-a4d0e7c132a92025f7c3dd7cf96bc763799ef2de.zip |
ALSA: ua101: Fix unlocked snd_pcm_stop() call
commit 9538aa46c2427d6782aa10036c4da4c541605e0e upstream.
snd_pcm_stop() must be called in the PCM substream lock context.
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/misc/ua101.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c index c0609c210303..84052cfa409f 100644 --- a/sound/usb/misc/ua101.c +++ b/sound/usb/misc/ua101.c @@ -613,14 +613,24 @@ static int start_usb_playback(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_stream_unlock_irqrestore(ua->capture.substream, flags); + } } 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_stream_unlock_irqrestore(ua->playback.substream, flags); + } } static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream, |