1 files changed, 8 insertions, 1 deletions

diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index a70ee7f1ed98..031e215b6dde 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -272,7 +272,14 @@ static int snd_hwdep_control_ioctl(struct snd_card *card,
                         if (get_user(device, (int __user *)arg))
                                 return -EFAULT;
                         mutex_lock(&register_mutex);
-                        device = device < 0 ? 0 : device + 1;
+
+                        if (device < 0)
+                                device = 0;
+                        else if (device < SNDRV_MINOR_HWDEPS)
+                                device++;
+                        else
+                                device = SNDRV_MINOR_HWDEPS;
+
                         while (device < SNDRV_MINOR_HWDEPS) {
                                 if (snd_hwdep_search(card, device))
                                         break;