Commit 3ad4f597 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Make the HP EliteBook 8530p use AD1884A model laptop
  ALSA: gusextreme: Fix build errors
  ALSA: hdsp: check for iobox and upload firmware during ioctl
  ALSA: HDSP: check for io box before uploading firmware
  ALSA: hda - Add another HP model (6730s) for AD1884A
  alsa: fix snd_BUG_on() and friends
  ALSA: hda - Add a quirk for MEDION MD96630
  ALSA: hda - Limit the number of GPIOs show in proc
parents 8a8bc223 6b425660

include/sound/core.h

+7 −3
Original line number Diff line number Diff line
@@ -385,9 +385,13 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...) 


#else /* !CONFIG_SND_DEBUG */



#define snd_printd(fmt, args...)	/* nothing */

#define snd_BUG()			/* nothing */

#define snd_BUG_ON(cond)	({/*(void)(cond);*/ 0;})  /* always false */

#define snd_printd(fmt, args...)	do { } while (0)

#define snd_BUG()			do { } while (0)

static inline int __snd_bug_on(void)

{

	return 0;

}

#define snd_BUG_ON(cond)		__snd_bug_on()  /* always false */



#endif /* CONFIG_SND_DEBUG */

sound/isa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ config SND_GUSCLASSIC 


config SND_GUSEXTREME

	tristate "Gravis UltraSound Extreme"

	select SND_HWDEP

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_PCM

	help

sound/pci/hda/hda_proc.c

+2 −0
Original line number Diff line number Diff line
@@ -483,6 +483,8 @@ static void print_gpio(struct snd_info_buffer *buffer, 
		    (gpio & AC_GPIO_UNSOLICITED) ? 1 : 0,

		    (gpio & AC_GPIO_WAKE) ? 1 : 0);

	max = gpio & AC_GPIO_IO_COUNT;

	if (!max || max > 8)

		return;

	enable = snd_hda_codec_read(codec, nid, 0,

				    AC_VERB_GET_GPIO_MASK, 0);

	direction = snd_hda_codec_read(codec, nid, 0,

sound/pci/hda/patch_analog.c

+2 −0
Original line number Diff line number Diff line
@@ -3861,6 +3861,8 @@ static const char *ad1884a_models[AD1884A_MODELS] = { 
static struct snd_pci_quirk ad1884a_cfg_tbl[] = {

	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),

	SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),

	SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),

	SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),

	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),

	{}

};

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -8469,6 +8469,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3bfd, "Lenovo NB0763", ALC883_LENOVO_NB0763),

	SND_PCI_QUIRK(0x17aa, 0x101d, "Lenovo Sky", ALC888_LENOVO_SKY),

	SND_PCI_QUIRK(0x17c0, 0x4071, "MEDION MD2", ALC883_MEDION_MD2),

	SND_PCI_QUIRK(0x17c0, 0x4085, "MEDION MD96630", ALC888_LENOVO_MS7195_DIG),

	SND_PCI_QUIRK(0x17f2, 0x5000, "Albatron KI690-AM2", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),

	SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),

CRA Git | Maintained and supported by SUSTech CRA and CCSE