From: Andrej Krutak <dev@andree.sk>
Date: Thu, 18 Aug 2016 21:52:10 +0000 (+0200)
Subject: ALSA: line6: Remove double line6_pcm_release() after failed acquire.
X-Git-Tag: firefly_0821_release~176^2~4^2~31^2~198
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=85db22a1079b6e10d30b83aca749c98b612d2867;p=firefly-linux-kernel-4.4.55.git

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>
---

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 {