提交 84ac9bb1 编写于 作者: T Takashi Iwai

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: NChris Rorvick <chris@rorvick.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 7d70c81c
...@@ -227,9 +227,8 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册