summaryrefslogtreecommitdiffstats
path: root/sound/usb/line6
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/line6')
-rw-r--r--sound/usb/line6/pcm.c11
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;
}