Re: [PATCH 46/50] Sound: usb: ua101: spin_lock in complete() cleanup
From: Sergei Shtylyov <hidden>
Date: 2013-07-11 13:10:55
Also in:
alsa-devel, linux-input, linux-media, linux-wireless
On 11-07-2013 13:06, Ming Lei wrote:
Here the subject doesn't match the patch.
Complete() will be run with interrupt enabled, so disable local interrupt before holding a global lock which is held without irqsave.
Cc: Clemens Ladisch <clemens@ladisch.de> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <redacted> Cc: alsa-devel@alsa-project.org Signed-off-by: Ming Lei <redacted> --- sound/usb/misc/ua101.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
quoted hunk ↗ jump to hunk
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c index 8b5d2c5..52a60c6 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)) + if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states)) { + unsigned long flags; + + local_irq_save(flags); snd_pcm_stop(ua->capture.substream, SNDRV_PCM_STATE_XRUN); + local_irq_restore(flags); + } } static void abort_alsa_playback(struct ua101 *ua) { - if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states)) + if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states)) { + unsigned long flags; + + local_irq_save(flags); snd_pcm_stop(ua->playback.substream, SNDRV_PCM_STATE_XRUN); + local_irq_restore(flags); + } }
WBR, Sergei