2 files changed, 4 insertions, 5 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index 6973a9686b67..48ef0a09a7a7 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1018,10 +1018,6 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file,
         }
         switch (info->type) {
         case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
-                private_size = sizeof(char);
-                if (info->count > 128)
-                        return -EINVAL;
-                break;
         case SNDRV_CTL_ELEM_TYPE_INTEGER:
                 private_size = sizeof(long);
                 if (info->count > 128)
diff --git a/sound/core/info.c b/sound/core/info.c
index e43662b33f16..0b4aab3225e5 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -120,7 +120,10 @@ int snd_iprintf(struct snd_info_buffer *buffer, char *fmt,...)
         len = buffer->len - buffer->size;
         va_start(args, fmt);
         for (;;) {
-                res = vsnprintf(buffer->buffer + buffer->curr, len, fmt, args);
+                va_list ap;
+                va_copy(ap, args);
+                res = vsnprintf(buffer->buffer + buffer->curr, len, fmt, ap);
+                va_end(ap);
                 if (res < len)
                         break;
                 err = resize_info_buffer(buffer, buffer->len + PAGE_SIZE);