| Message ID | 1373533573-12272-47-git-send-email-ming.lei@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <tiwai@suse.de>
> Cc: alsa-devel@alsa-project.org
> Signed-off-by: Ming Lei <ming.lei@canonical.com>
> ---
> sound/usb/misc/ua101.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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); + } } static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream,
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 <tiwai@suse.de> Cc: alsa-devel@alsa-project.org Signed-off-by: Ming Lei <ming.lei@canonical.com> --- sound/usb/misc/ua101.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)