Skip to contentSkip to conversation

sound fixes for 3.11-final

GIT PULL Takashi Iwai 1 participant 1 message Aug 30, 2013 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

The following changes since commit 1801928e0f99d94c55e33c584c5eb2ff5e246ee6:

ALSA: hda - Add a fixup for Gateway LT27 (2013-08-16 08:17:05 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.11

for you to fetch changes up to fb615499f0ad28ed74201c1cdfddf9e64e205424:

ALSA: opti9xx: Fix conflicting driver object name (2013-08-28 08:22:16 +0200)

----------------------------------------------------------------

sound fixes for 3.11

This contains two Oops fixes (opti9xx and HD-audio) and a simple fixup for an Acer laptop. All marked as stable patches.

----------------------------------------------------------------
Takashi Iwai (3):
ALSA: hda - Add inverted digital mic fixup for Acer Aspire One
ALSA: hda - Fix NULL dereference with CONFIG_SND_DYNAMIC_MINORS=n
ALSA: opti9xx: Fix conflicting driver object name

 sound/isa/opti9xx/opti92x-ad1848.c | 8 ++------
 sound/pci/hda/patch_hdmi.c         | 3 +++
 sound/pci/hda/patch_realtek.c      | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)
sound/isa/opti9xx/opti92x-ad1848.c +2 -6
index 103b333..6effe99 100644
@@ -173,11 +173,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids);
 
 #endif	/* CONFIG_PNP */
 
-#ifdef OPTi93X
-#define DEV_NAME "opti93x"
-#else
-#define DEV_NAME "opti92x"
-#endif
+#define DEV_NAME KBUILD_MODNAME
 
 static char * snd_opti9xx_names[] = {
 	"unknown",
@@ -1167,7 +1163,7 @@ static int snd_opti9xx_pnp_resume(struct pnp_card_link *pcard)
 
 static struct pnp_card_driver opti9xx_pnpc_driver = {
 	.flags		= PNP_DRIVER_RES_DISABLE,
-	.name		= "opti9xx",
+	.name		= DEV_NAME,
 	.id_table	= snd_opti9xx_pnpids,
 	.probe		= snd_opti9xx_pnp_probe,
 	.remove		= snd_opti9xx_pnp_remove,
sound/pci/hda/patch_hdmi.c +3 -0
index 030ca86..9f35862 100644
@@ -1781,6 +1781,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec)
 		struct snd_pcm_chmap *chmap;
 		struct snd_kcontrol *kctl;
 		int i;
+
+		if (!codec->pcm_info[pin_idx].pcm)
+			break;
 		err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm,
 					     SNDRV_PCM_STREAM_PLAYBACK,
 					     NULL, 0, pin_idx, &chmap);
sound/pci/hda/patch_realtek.c +1 -0
index f303cd8..389db4c 100644
@@ -4336,6 +4336,7 @@ static const struct hda_fixup alc662_fixups[] = {
 
 static const struct snd_pci_quirk alc662_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_FIXUP_ASUS_MODE2),
+	SND_PCI_QUIRK(0x1025, 0x022f, "Acer Aspire One", ALC662_FIXUP_INV_DMIC),
 	SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE),
 	SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),
 	SND_PCI_QUIRK(0x1025, 0x0349, "eMachines eM250", ALC662_FIXUP_INV_DMIC),