Pull sound fixes from Takashi Iwai: "This contains two Oops fixes (opti9xx and HD-audio) and a simple fixup for an Acer laptop. All marked as stable patches" * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: opti9xx: Fix conflicting driver object name ALSA: hda - Fix NULL dereference with CONFIG_SND_DYNAMIC_MINORS=n ALSA: hda - Add inverted digital mic fixup for Acer Aspire One
Unified · Split
| @@ -173,11 +173,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids); · 172 unmodified lines | |||
| 173 | 173 | ||
| 174 | #endif /* CONFIG_PNP */ | 174 | #endif /* CONFIG_PNP */ |
| 175 | 175 | ||
| 176 | #ifdef OPTi93X | 176 | #define DEV_NAME KBUILD_MODNAME |
| 177 | #define DEV_NAME "opti93x" | ||
| 178 | #else | ||
| 179 | #define DEV_NAME "opti92x" | ||
| 180 | #endif | ||
| 181 | 177 | ||
| 182 | static char * snd_opti9xx_names[] = { | 178 | static char * snd_opti9xx_names[] = { |
| 183 | "unknown", | 179 | "unknown", |
| @@ -1167,7 +1163,7 @@ static int snd_opti9xx_pnp_resume(struct pnp_card_link *pcard) · 983 unmodified lines | |||
| 1167 | 1163 | ||
| 1168 | static struct pnp_card_driver opti9xx_pnpc_driver = { | 1164 | static struct pnp_card_driver opti9xx_pnpc_driver = { |
| 1169 | .flags = PNP_DRIVER_RES_DISABLE, | 1165 | .flags = PNP_DRIVER_RES_DISABLE, |
| 1170 | .name = "opti9xx", | 1166 | .name = DEV_NAME, |
| 1171 | .id_table = snd_opti9xx_pnpids, | 1167 | .id_table = snd_opti9xx_pnpids, |
| 1172 | .probe = snd_opti9xx_pnp_probe, | 1168 | .probe = snd_opti9xx_pnp_probe, |
| 1173 | .remove = snd_opti9xx_pnp_remove, | 1169 | .remove = snd_opti9xx_pnp_remove, |
| @@ -1781,6 +1781,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) · 1780 unmodified lines | |||
| 1781 | struct snd_pcm_chmap *chmap; | 1781 | struct snd_pcm_chmap *chmap; |
| 1782 | struct snd_kcontrol *kctl; | 1782 | struct snd_kcontrol *kctl; |
| 1783 | int i; | 1783 | int i; |
| 1784 | |||
| 1785 | if (!codec->pcm_info[pin_idx].pcm) | ||
| 1786 | break; | ||
| 1784 | err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm, | 1787 | err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm, |
| 1785 | SNDRV_PCM_STREAM_PLAYBACK, | 1788 | SNDRV_PCM_STREAM_PLAYBACK, |
| 1786 | NULL, 0, pin_idx, &chmap); | 1789 | NULL, 0, pin_idx, &chmap); |
| @@ -4336,6 +4336,7 @@ static const struct hda_fixup alc662_fixups[] = { · 4335 unmodified lines | |||
| 4336 | 4336 | ||
| 4337 | static const struct snd_pci_quirk alc662_fixup_tbl[] = { | 4337 | static const struct snd_pci_quirk alc662_fixup_tbl[] = { |
| 4338 | SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_FIXUP_ASUS_MODE2), | 4338 | SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_FIXUP_ASUS_MODE2), |
| 4339 | SND_PCI_QUIRK(0x1025, 0x022f, "Acer Aspire One", ALC662_FIXUP_INV_DMIC), | ||
| 4339 | SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE), | 4340 | SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE), |
| 4340 | SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE), | 4341 | SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE), |
| 4341 | SND_PCI_QUIRK(0x1025, 0x0349, "eMachines eM250", ALC662_FIXUP_INV_DMIC), | 4342 | SND_PCI_QUIRK(0x1025, 0x0349, "eMachines eM250", ALC662_FIXUP_INV_DMIC), |