summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAndrej Krutak <dev@andree.sk>2016-08-18 23:52:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-07 08:32:46 +0200
commit85db22a1079b6e10d30b83aca749c98b612d2867 (patch)
treea959af920a5f918ddc297fd39745305c4c481d5d /sound
parent37e16dc96556fbcba12b6bb1d151df5a769e7928 (diff)
ALSA: line6: Remove double line6_pcm_release() after failed acquire.
commit 7e4379eae0e31994ea645db1d13006ea8e5ce539 upstream. If there's an error, pcm is released in line6_pcm_acquire already. Fixes: 247d95ee6dd2 ('ALSA: line6: Handle error from line6_pcm_acquire()') Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Andrej Krutak <dev@andree.sk> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/line6/pcm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c
index 204cc074adb9..2bc8879757f9 100644
--- a/sound/usb/line6/pcm.c
+++ b/sound/usb/line6/pcm.c
@@ -55,7 +55,6 @@ static int snd_line6_impulse_volume_put(struct snd_kcontrol *kcontrol,
err = line6_pcm_acquire(line6pcm, LINE6_STREAM_IMPULSE);
if (err < 0) {
line6pcm->impulse_volume = 0;
- line6_pcm_release(line6pcm, LINE6_STREAM_IMPULSE);
return err;
}
} else {