From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 29 May 2015 12:06:32 +0000 (+0200)
Subject: ALSA: jack: Fix the id uniqueness check
X-Git-Tag: v4.2-rc3~17^2~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0a601c278de6876f36bcf1b7a9678d93d7dc67b;p=platform%2Fkernel%2Flinux-exynos.git

ALSA: jack: Fix the id uniqueness check

snd_kctl_jack_new() tries to assign a unique index number when a name
string that has been already registered is passed.  However, it checks
with the base string without "Jack" suffix, so it never hits.
Fix the call with the properly processed name string instead.

Fixes: b8dd086674cf 'ALSA: Jack: handle jack embedded kcontrol creating within ctljack')
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c
index 8f8d103..9149a4a 100644
--- a/sound/core/ctljack.c
+++ b/sound/core/ctljack.c
@@ -70,7 +70,7 @@ snd_kctl_jack_new(const char *name, struct snd_card *card)
 		return NULL;
 
 	jack_kctl_name_gen(kctl->id.name, name, sizeof(kctl->id.name));
-	kctl->id.index = get_available_index(card, name);
+	kctl->id.index = get_available_index(card, kctl->id.name);
 	kctl->private_value = 0;
 	return kctl;
 }