Merge branch 'for-next' into for-linus

Merged 4.8 changes.

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 286f5e3686a3..937071760bc4 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -1272,11 +1272,11 @@ static int snd_echo_mixer_info(struct snd_kcontrol *kcontrol,
 
         chip = snd_kcontrol_chip(kcontrol);
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = 1;
         uinfo->value.integer.min = ECHOGAIN_MINOUT;
         uinfo->value.integer.max = ECHOGAIN_MAXOUT;
         uinfo->dimen.d[0] = num_busses_out(chip);
         uinfo->dimen.d[1] = num_busses_in(chip);
+        uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1];
         return 0;
 }
 
@@ -1344,11 +1344,11 @@ static int snd_echo_vmixer_info(struct snd_kcontrol *kcontrol,
 
         chip = snd_kcontrol_chip(kcontrol);
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = 1;
         uinfo->value.integer.min = ECHOGAIN_MINOUT;
         uinfo->value.integer.max = ECHOGAIN_MAXOUT;
         uinfo->dimen.d[0] = num_busses_out(chip);
         uinfo->dimen.d[1] = num_pipes_out(chip);
+        uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1];
         return 0;
 }
 
@@ -1728,7 +1728,6 @@ static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = 96;
         uinfo->value.integer.min = ECHOGAIN_MINOUT;
         uinfo->value.integer.max = 0;
 #ifdef ECHOCARD_HAS_VMIXER
@@ -1738,6 +1737,7 @@ static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol,
 #endif
         uinfo->dimen.d[1] = 16; /* 16 channels */
         uinfo->dimen.d[2] = 2;  /* 0=level, 1=peak */
+        uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1] * uinfo->dimen.d[2];
         return 0;
 }