projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-4.4' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into...
[firefly-linux-kernel-4.4.55.git]
/
sound
/
core
/
ctljack.c
diff --git
a/sound/core/ctljack.c
b/sound/core/ctljack.c
index 9149a4aefa9548e5b09d8d15a4e28dd90cb5918a..84a3cd683068a3bbf4a752e05c399600ce83572b 100644
(file)
--- 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));
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++;
sid.index++;
+ /* reset numid; otherwise snd_ctl_find_id() hits this again */
+ sid.numid = 0;
+ }
return sid.index;
}
return sid.index;
}