diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 10:58:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 10:58:33 -0700 |
| commit | dee6515b6d12188f4b9bbe76613371f7840a8a53 (patch) | |
| tree | 3acf4736ff5204871e194f3d2988efa75e136cb8 /sound/core | |
| parent | 73441c665bee555526b1cf3eef603a0cff0b7e19 (diff) | |
| parent | 68e7fffc0f3e95063ba5bd94ee6f9b8927247297 (diff) | |
| download | op-kernel-dev-dee6515b6d12188f4b9bbe76613371f7840a8a53.zip op-kernel-dev-dee6515b6d12188f4b9bbe76613371f7840a8a53.tar.gz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] hda-intel - Add check of MSI availabity
[ALSA] version 1.0.13
[ALSA] Fix addition of user-defined boolean controls
[ALSA] Fix AC97 power-saving mode
[ALSA] Fix re-use of va_list
[ALSA] hda_intel: add ATI RS690 HDMI audio support
[ALSA] hda-codec - Add model entry for ASUS U5F laptop
[ALSA] Fix dependency of snd-adlib driver in Kconfig
[ALSA] Various fixes for suspend/resume of ALSA PCI drivers
[ALSA] hda-codec - Fix assignment of PCM devices for Realtek codecs
[ALSA] sound/isa/opti9xx/opti92x-ad1848.c: check kmalloc() return value
[ALSA] sound/isa/ad1816a/ad1816a.c: check kmalloc() return value
[ALSA] sound/isa/cmi8330.c: check kmalloc() return value
[ALSA] sound/isa/gus/interwave.c: check kmalloc() return value
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/control.c | 4 | ||||
| -rw-r--r-- | sound/core/info.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 6973a96..48ef0a0 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 e43662b..0b4aab3 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); |
