X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=sound%2Fcore%2Fctljack.c;h=84a3cd683068a3bbf4a752e05c399600ce83572b;hb=8c14f72b57570d71afda03c5c51b06f0b4af4367;hp=9149a4aefa9548e5b09d8d15a4e28dd90cb5918a;hpb=bbe179f88d39274630823a0dc07d2714fd19a103;p=firefly-linux-kernel-4.4.55.git

diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c
index 9149a4aefa95..84a3cd683068 100644
--- a/sound/core/ctljack.c
+++ b/sound/core/ctljack.c
@@ -41,8 +41,11 @@ static int get_available_index(struct snd_card *card, const char *name)
 	sid.iface = SNDRV_CTL_ELEM_IFACE_CARD;
 	strlcpy(sid.name, name, sizeof(sid.name));
 
-	while (snd_ctl_find_id(card, &sid))
+	while (snd_ctl_find_id(card, &sid)) {
 		sid.index++;
+		/* reset numid; otherwise snd_ctl_find_id() hits this again */
+		sid.numid = 0;
+	}
 
 	return sid.index;
 }