p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: line6: Drop superfluous irqsave/irqrestore in PCM trigger callback 

The PCM trigger callback is guaranteed to be called already in
spinlock / irq-disabled context.

Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-19 15:15:21 +01:00
parent 7d70c81cca
commit 84ac9bb12e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/usb/line6/pcm.c
View File

@ -227,9 +227,8 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
struct snd_pcm_substream *s; struct snd_pcm_substream *s;
int err; int err;
unsigned long flags;
spin_lock_irqsave(&line6pcm->lock_trigger, flags); spin_lock(&line6pcm->lock_trigger);
clear_bit(LINE6_INDEX_PREPARED, &line6pcm->flags); clear_bit(LINE6_INDEX_PREPARED, &line6pcm->flags);
snd_pcm_group_for_each_entry(s, substream) { snd_pcm_group_for_each_entry(s, substream) {
@ -240,8 +239,7 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
err = snd_line6_playback_trigger(line6pcm, cmd); err = snd_line6_playback_trigger(line6pcm, cmd);
if (err < 0) { if (err < 0) {
spin_unlock_irqrestore(&line6pcm->lock_trigger, spin_unlock(&line6pcm->lock_trigger);
flags);
return err; return err;
} }
@ -251,8 +249,7 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
err = snd_line6_capture_trigger(line6pcm, cmd); err = snd_line6_capture_trigger(line6pcm, cmd);
if (err < 0) { if (err < 0) {
spin_unlock_irqrestore(&line6pcm->lock_trigger, spin_unlock(&line6pcm->lock_trigger);
flags);
return err; return err;
} }
@ -264,7 +261,7 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
} }
} }
spin_unlock_irqrestore(&line6pcm->lock_trigger, flags); spin_unlock(&line6pcm->lock_trigger);
return 0; return 0;
} }