diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-19 15:15:21 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-20 08:16:18 +0100 |
| commit | 84ac9bb12e8158e1affad4ae7718eb653fa5e36d (patch) | |
| tree | c889e2360957b28edef137264b6d1f8a8838d5ce /sound/usb | |
| parent | 7d70c81ccaccb74326255fb9549c872bc29193d6 (diff) | |
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>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/line6/pcm.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index 932cc7e194e..edab3cd7c04 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c @@ -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_pcm_substream *s; int err; - unsigned long flags; - spin_lock_irqsave(&line6pcm->lock_trigger, flags); + spin_lock(&line6pcm->lock_trigger); clear_bit(LINE6_INDEX_PREPARED, &line6pcm->flags); 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); if (err < 0) { - spin_unlock_irqrestore(&line6pcm->lock_trigger, - flags); + spin_unlock(&line6pcm->lock_trigger); return err; } @@ -251,8 +249,7 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd) err = snd_line6_capture_trigger(line6pcm, cmd); if (err < 0) { - spin_unlock_irqrestore(&line6pcm->lock_trigger, - flags); + spin_unlock(&line6pcm->lock_trigger); 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; } |