diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-12-14 11:05:24 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-12-14 11:05:29 +0300 |
| commit | e5fab13a7c54b8e69ea3bb27067eb06aba5f19b5 (patch) | |
| tree | 32ee15f944c907b7442da9d124efba8e67c7ece6 /sound/usb/stream.c | |
| parent | d84489e374f5b9b3ab424a5169e68e06a4329524 (diff) | |
| parent | c6dde8ffd071aea9d1ce64279178e470977b235c (diff) | |
| download | linux-e5fab13a7c54b8e69ea3bb27067eb06aba5f19b5.tar.xz | |
Merge branch 'for-linus' into for-next
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/stream.c')
| -rw-r--r-- | sound/usb/stream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 7f58c7625cd4..ee9aa1dcf0d8 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -192,16 +192,16 @@ static int usb_chmap_ctl_get(struct snd_kcontrol *kcontrol, struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol); struct snd_usb_substream *subs = info->private_data; struct snd_pcm_chmap_elem *chmap = NULL; - int i; + int i = 0; - memset(ucontrol->value.integer.value, 0, - sizeof(ucontrol->value.integer.value)); if (subs->cur_audiofmt) chmap = subs->cur_audiofmt->chmap; if (chmap) { for (i = 0; i < chmap->channels; i++) ucontrol->value.integer.value[i] = chmap->map[i]; } + for (; i < subs->channels_max; i++) + ucontrol->value.integer.value[i] = 0; return 0; } |