1 files changed, 4 insertions, 0 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index 5c49f976fc7b..8d6e4bae7407 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -288,6 +288,10 @@ static bool snd_ctl_remove_numid_conflict(struct snd_card *card,
 {
         struct snd_kcontrol *kctl;
 
+        /* Make sure that the ids assigned to the control do not wrap around */
+        if (card->last_numid >= UINT_MAX - count)
+                card->last_numid = 0;
+
         list_for_each_entry(kctl, &card->controls, list) {
                 if (kctl->id.numid < card->last_numid + 1 + count &&
                     kctl->id.numid + kctl->count > card->last_numid + 1) {