Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
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
+6
-6
+2
-6
sound/isa/opti9xx/opti92x-ad1848.c
+2
-6
sound/isa/opti9xx/opti92x-ad1848.c
···
173
173
174
174
#endif /* CONFIG_PNP */
175
175
176
-
#ifdef OPTi93X
177
-
#define DEV_NAME "opti93x"
178
-
#else
179
-
#define DEV_NAME "opti92x"
180
-
#endif
176
+
#define DEV_NAME KBUILD_MODNAME
181
177
182
178
static char * snd_opti9xx_names[] = {
183
179
"unknown",
···
1163
1167
1164
1168
static struct pnp_card_driver opti9xx_pnpc_driver = {
1165
1169
.flags = PNP_DRIVER_RES_DISABLE,
1166
-
.name = "opti9xx",
1170
+
.name = DEV_NAME,
1167
1171
.id_table = snd_opti9xx_pnpids,
1168
1172
.probe = snd_opti9xx_pnp_probe,
1169
1173
.remove = snd_opti9xx_pnp_remove,
+3
sound/pci/hda/patch_hdmi.c
+3
sound/pci/hda/patch_hdmi.c
···
1781
1781
struct snd_pcm_chmap *chmap;
1782
1782
struct snd_kcontrol *kctl;
1783
1783
int i;
1784
+
1785
+
if (!codec->pcm_info[pin_idx].pcm)
1786
+
break;
1784
1787
err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm,
1785
1788
SNDRV_PCM_STREAM_PLAYBACK,
1786
1789
NULL, 0, pin_idx, &chmap);
+1
sound/pci/hda/patch_realtek.c
+1
sound/pci/hda/patch_realtek.c
···
4336
4336
4337
4337
static const struct snd_pci_quirk alc662_fixup_tbl[] = {
4338
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
4340
SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE),
4340
4341
SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),
4341
4342
SND_PCI_QUIRK(0x1025, 0x0349, "eMachines eM250", ALC662_FIXUP_INV_DMIC),