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

Commit 37561442 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: Allow to force model to intel-mac-v3 in snd_hda_intel (sigmatel).
  ALSA: cs4232: fix crash during chip PNP detection
  ALSA: hda - Add automatic model setting for the Acer Aspire 5920G laptop
  ALSA: make snd_ac97_add_vmaster() static
  ALSA: sound/pci/azt3328.h: no variables for enums
  ALSA: soc - wm9712 mono mixer
  ALSA: hda - Add support of ASUS Eeepc P90*
  ALSA: opti9xx: no isapnp param for !CONFIG_PNP
  ALSA: opti93x - Fix NULL dereference
  ALSA: hda - Added support for Asus V1Sn
  ALSA: ASoC: Factor PGA DAPM handling into main
  ALSA: ASoC: Refactor DAPM event handler
  ALSA: ALSA: ens1370: communicate PCI device to AC97
  ALSA: ens1370: SRC stands for Sample Rate Converter
  ALSA: hda - Align BDL position adjustment parameter
  ALSA: Au1xpsc: psc not disabled when TX is idle
  ALSA: add TriTech 28023 AC97 codec ID and Wolfson 9701 name.
parents eeb61f71 536319af

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -1024,6 +1024,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  intel-mac-v3	Intel Mac Type 3

	  intel-mac-v3	Intel Mac Type 3

	  intel-mac-v4	Intel Mac Type 4

	  intel-mac-v4	Intel Mac Type 4

	  intel-mac-v5	Intel Mac Type 5

	  intel-mac-v5	Intel Mac Type 5

	  intel-mac-auto Intel Mac (detect type according to subsystem id)

	  macmini	Intel Mac Mini (equivalent with type 3)

	  macmini	Intel Mac Mini (equivalent with type 3)

	  macbook	Intel Mac Book (eq. type 5)

	  macbook	Intel Mac Book (eq. type 5)

	  macbook-pro-v1 Intel Mac Book Pro 1st generation (eq. type 3)

	  macbook-pro-v1 Intel Mac Book Pro 1st generation (eq. type 3)

sound/isa/cs423x/cs4236.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -325,6 +325,7 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev) 
static int __devinit snd_card_cs4232_pnp(int dev, struct snd_card_cs4236 *acard,

static int __devinit snd_card_cs4232_pnp(int dev, struct snd_card_cs4236 *acard,

					 struct pnp_dev *pdev)

					 struct pnp_dev *pdev)

{

{

	acard->wss = pdev;

	if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0)

	if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0)

		return -EBUSY;

		return -EBUSY;

	cport[dev] = -1;

	cport[dev] = -1;

sound/isa/opti9xx/opti92x-ad1848.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,9 @@ MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (AD1848)}," 
static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */

static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */

static char *id = SNDRV_DEFAULT_STR1;		/* ID for this card */

static char *id = SNDRV_DEFAULT_STR1;		/* ID for this card */

//static int enable = SNDRV_DEFAULT_ENABLE1;	/* Enable this card */

//static int enable = SNDRV_DEFAULT_ENABLE1;	/* Enable this card */

#ifdef CONFIG_PNP

static int isapnp = 1;			/* Enable ISA PnP detection */

static int isapnp = 1;			/* Enable ISA PnP detection */

#endif

static long port = SNDRV_DEFAULT_PORT1; 	/* 0x530,0xe80,0xf40,0x604 */

static long port = SNDRV_DEFAULT_PORT1; 	/* 0x530,0xe80,0xf40,0x604 */

static long mpu_port = SNDRV_DEFAULT_PORT1;	/* 0x300,0x310,0x320,0x330 */

static long mpu_port = SNDRV_DEFAULT_PORT1;	/* 0x300,0x310,0x320,0x330 */

static long fm_port = SNDRV_DEFAULT_PORT1;	/* 0x388 */

static long fm_port = SNDRV_DEFAULT_PORT1;	/* 0x388 */
@@ -85,8 +87,10 @@ module_param(id, charp, 0444); 
MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard.");

MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard.");

//module_param(enable, bool, 0444);

//module_param(enable, bool, 0444);

//MODULE_PARM_DESC(enable, "Enable opti9xx soundcard.");

//MODULE_PARM_DESC(enable, "Enable opti9xx soundcard.");

#ifdef CONFIG_PNP

module_param(isapnp, bool, 0444);

module_param(isapnp, bool, 0444);

MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard.");

MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard.");

#endif

module_param(port, long, 0444);

module_param(port, long, 0444);

MODULE_PARM_DESC(port, "WSS port # for opti9xx driver.");

MODULE_PARM_DESC(port, "WSS port # for opti9xx driver.");

module_param(mpu_port, long, 0444);

module_param(mpu_port, long, 0444);
@@ -688,7 +692,7 @@ static void snd_card_opti9xx_free(struct snd_card *card) 
	if (chip) {

	if (chip) {

#ifdef OPTi93X

#ifdef OPTi93X

		struct snd_cs4231 *codec = chip->codec;

		struct snd_cs4231 *codec = chip->codec;

		if (codec->irq > 0) {

		if (codec && codec->irq > 0) {

			disable_irq(codec->irq);

			disable_irq(codec->irq);

			free_irq(codec->irq, codec);

			free_irq(codec->irq, codec);

		}

		}

sound/pci/ac97/ac97_codec.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -161,6 +161,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { 
{ 0x50534304, 0xffffffff, "UCB1400",		patch_ucb1400,	NULL },

{ 0x50534304, 0xffffffff, "UCB1400",		patch_ucb1400,	NULL },

{ 0x53494c20, 0xffffffe0, "Si3036,8",		mpatch_si3036,	mpatch_si3036, AC97_MODEM_PATCH },

{ 0x53494c20, 0xffffffe0, "Si3036,8",		mpatch_si3036,	mpatch_si3036, AC97_MODEM_PATCH },

{ 0x54524102, 0xffffffff, "TR28022",		NULL,		NULL },

{ 0x54524102, 0xffffffff, "TR28022",		NULL,		NULL },

{ 0x54524103, 0xffffffff, "TR28023",		NULL,		NULL },

{ 0x54524106, 0xffffffff, "TR28026",		NULL,		NULL },

{ 0x54524106, 0xffffffff, "TR28026",		NULL,		NULL },

{ 0x54524108, 0xffffffff, "TR28028",		patch_tritech_tr28028,	NULL }, // added by xin jin [07/09/99]

{ 0x54524108, 0xffffffff, "TR28028",		patch_tritech_tr28028,	NULL }, // added by xin jin [07/09/99]

{ 0x54524123, 0xffffffff, "TR28602",		NULL,		NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)]

{ 0x54524123, 0xffffffff, "TR28602",		NULL,		NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)]
@@ -169,7 +170,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { 
{ 0x56494170, 0xffffffff, "VIA1617A",		patch_vt1617a,	NULL }, // modified VT1616 with S/PDIF

{ 0x56494170, 0xffffffff, "VIA1617A",		patch_vt1617a,	NULL }, // modified VT1616 with S/PDIF

{ 0x56494182, 0xffffffff, "VIA1618",		NULL,		NULL },

{ 0x56494182, 0xffffffff, "VIA1618",		NULL,		NULL },

{ 0x57454301, 0xffffffff, "W83971D",		NULL,		NULL },

{ 0x57454301, 0xffffffff, "W83971D",		NULL,		NULL },

{ 0x574d4c00, 0xffffffff, "WM9701A",		NULL,		NULL },

{ 0x574d4c00, 0xffffffff, "WM9701,WM9701A",	NULL,		NULL },

{ 0x574d4C03, 0xffffffff, "WM9703,WM9707,WM9708,WM9717", patch_wolfson03, NULL},

{ 0x574d4C03, 0xffffffff, "WM9703,WM9707,WM9708,WM9717", patch_wolfson03, NULL},

{ 0x574d4C04, 0xffffffff, "WM9704M,WM9704Q",	patch_wolfson04, NULL},

{ 0x574d4C04, 0xffffffff, "WM9704M,WM9704Q",	patch_wolfson04, NULL},

{ 0x574d4C05, 0xffffffff, "WM9705,WM9710",	patch_wolfson05, NULL},

{ 0x574d4C05, 0xffffffff, "WM9705,WM9710",	patch_wolfson05, NULL},

sound/pci/ac97/ac97_patch.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3381,7 +3381,7 @@ static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97, 
}

}





/* create a virtual master control and add slaves */

/* create a virtual master control and add slaves */

int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,

static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,

				const unsigned int *tlv, const char **slaves)

				const unsigned int *tlv, const char **slaves)

{

{

	struct snd_kcontrol *kctl;

	struct snd_kcontrol *kctl;