Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dee6515b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 73441c66 68e7fffc

include/sound/version.h

+1 −1
Original line number Diff line number Diff line 
/* include/version.h.  Generated by alsa/ksync script.  */

#define CONFIG_SND_VERSION "1.0.13"

#define CONFIG_SND_DATE " (Fri Oct 06 18:28:19 2006 UTC)"
 
#define CONFIG_SND_DATE " (Sun Oct 22 08:56:16 2006 UTC)"

sound/core/control.c

+0 −4
Original line number Diff line number Diff line
@@ -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)

sound/core/info.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

sound/isa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config SND_CS4231_LIB 


config SND_ADLIB

	tristate "AdLib FM card"

	depends on SND

	select SND_OPL3_LIB

	help

	  Say Y here to include support for AdLib FM cards.

sound/isa/ad1816a/ad1816a.c

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar 
	struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);

	int err;



	if (!cfg)

		return -ENOMEM;

	acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);

	if (acard->dev == NULL) {

		kfree(cfg);