diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 17:58:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 14:07:25 -0700 |
| commit | c9c8dd7d3cacecd3a3f0e6e49c0a0f8f93d3d04e (patch) | |
| tree | 38452ec453707cb77fc61f21f2424346d864adef /sound | |
| parent | 2bc2f7d622af45d07980a83586c95c7530e4f6cc (diff) | |
| download | linux-3.10-c9c8dd7d3cacecd3a3f0e6e49c0a0f8f93d3d04e.tar.gz linux-3.10-c9c8dd7d3cacecd3a3f0e6e49c0a0f8f93d3d04e.tar.bz2 linux-3.10-c9c8dd7d3cacecd3a3f0e6e49c0a0f8f93d3d04e.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 6ad617b9473..76d832908fe 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, |