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

Commit 2528ed11 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: Kill truncate warning by shortening Sigmatel-specific AC97 control name
  ALSA: hda - fix audio on HP TX25xx series notebooks
  ALSA: pcsp - fix printk format warning again
parents 6a44587e 4986cab5

sound/drivers/pcsp/pcsp_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol, 
	if (uinfo->value.enumerated.item > chip->max_treble)

		uinfo->value.enumerated.item = chip->max_treble;

	sprintf(uinfo->value.enumerated.name, "%lu",

			PCSP_CALC_RATE(uinfo->value.enumerated.item));

		(unsigned long)PCSP_CALC_RATE(uinfo->value.enumerated.item));

	return 0;

}

sound/pci/ac97/ac97_patch.c

+5 −2
Original line number Diff line number Diff line
@@ -958,10 +958,13 @@ static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97) 
}



static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker =

AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);

AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch",

		AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);



/* "Sigmatel " removed due to excessive name length: */

static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert =

AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);

AC97_SINGLE("Surround Phase Inversion Playback Switch",

		AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);



static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = {

AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),

sound/pci/ca0106/ca0106_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) 
		"Capture Volume",

		"External Amplifier",

		"Sigmatel 4-Speaker Stereo Playback Switch",

		"Sigmatel Surround Phase Inversion Playback ",

		"Surround Phase Inversion Playback Switch",

		NULL

	};

	static char *ca0106_rename_ctls[] = {

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -12058,6 +12058,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),

	SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),

	SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),

	SND_PCI_QUIRK(0x103c, 0x30f1, "HP TX25xx series", ALC268_TOSHIBA),

	SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),

	SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),

	SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),