]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ALSA: jack: Fix the id uniqueness check
authorTakashi Iwai <tiwai@suse.de>
Fri, 29 May 2015 12:06:32 +0000 (14:06 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 29 May 2015 12:06:32 +0000 (14:06 +0200)
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>
sound/core/ctljack.c

index 8f8d1033425cf2129087b2da510cb6c181ad3d84..9149a4aefa9548e5b09d8d15a4e28dd90cb5918a 100644 (file)
@@ -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;
 }