summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAndrej Krutak <dev@andree.sk>2016-08-18 23:52:10 +0200
committerTakashi Iwai <tiwai@suse.de>2016-08-22 11:36:58 +0200
commit7e4379eae0e31994ea645db1d13006ea8e5ce539 (patch)
tree3439d705df949d3c5dea03095ccc90d017290a49 /sound
parenta52ff34e5ec61749c62c6618b76a9d6dbecee450 (diff)
downloadlinux-7e4379eae0e31994ea645db1d13006ea8e5ce539.tar.gz
linux-7e4379eae0e31994ea645db1d13006ea8e5ce539.tar.bz2
linux-7e4379eae0e31994ea645db1d13006ea8e5ce539.zip
ALSA: line6: Remove double line6_pcm_release() after failed acquire.
If there's an error, pcm is released in line6_pcm_acquire already. Fixes: 247d95ee6dd2 ('ALSA: line6: Handle error from line6_pcm_acquire()') Cc: <stable@vger.kernel.org> # v4.0+ Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Andrej Krutak <dev@andree.sk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 {