tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Fix a Oops bug in omap soc driver.
ALSA: hda - Remove non-working headphone control for Dell laptops
ALSA: hda - Add no-jd model for IDT 92HD73xx
ALSA: Revert "ALSA: hda: removed unneeded hp_nid references"
ALSA: hda - Add quirk for Dell Studio 17
ALSA: hda - Fix silent HP output on D975

Linus Torvalds 8837e341 281981ca

+22 -2
+2
Documentation/sound/alsa/ALSA-Configuration.txt
··· 1063 1063 1064 1064 STAC9227/9228/9229/927x 1065 1065 ref Reference board 1066 + ref-no-jd Reference board without HP/Mic jack detection 1066 1067 3stack D965 3stack 1067 1068 5stack D965 5stack + SPDIF 1068 1069 dell-3stack Dell Dimension E520 ··· 1077 1076 1078 1077 STAC92HD73* 1079 1078 ref Reference board 1079 + no-jd BIOS setup but without jack-detection 1080 1080 dell-m6-amic Dell desktops/laptops with analog mics 1081 1081 dell-m6-dmic Dell desktops/laptops with digital mics 1082 1082 dell-m6 Dell desktops/laptops with both type of mics
+19 -1
sound/pci/hda/patch_sigmatel.c
··· 69 69 }; 70 70 71 71 enum { 72 + STAC_92HD73XX_NO_JD, /* no jack-detection */ 72 73 STAC_92HD73XX_REF, 73 74 STAC_DELL_M6_AMIC, 74 75 STAC_DELL_M6_DMIC, ··· 128 127 }; 129 128 130 129 enum { 130 + STAC_D965_REF_NO_JD, /* no jack-detection */ 131 131 STAC_D965_REF, 132 132 STAC_D965_3ST, 133 133 STAC_D965_5ST, ··· 1613 1611 }; 1614 1612 1615 1613 static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { 1614 + [STAC_92HD73XX_NO_JD] = "no-jd", 1616 1615 [STAC_92HD73XX_REF] = "ref", 1617 1616 [STAC_DELL_M6_AMIC] = "dell-m6-amic", 1618 1617 [STAC_DELL_M6_DMIC] = "dell-m6-dmic", ··· 1643 1640 "unknown Dell", STAC_DELL_M6_DMIC), 1644 1641 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f, 1645 1642 "Dell Studio 1537", STAC_DELL_M6_DMIC), 1643 + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0, 1644 + "Dell Studio 17", STAC_DELL_M6_DMIC), 1646 1645 {} /* terminator */ 1647 1646 }; 1648 1647 ··· 2032 2027 }; 2033 2028 2034 2029 static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { 2030 + [STAC_D965_REF_NO_JD] = ref927x_pin_configs, 2035 2031 [STAC_D965_REF] = ref927x_pin_configs, 2036 2032 [STAC_D965_3ST] = d965_3st_pin_configs, 2037 2033 [STAC_D965_5ST] = d965_5st_pin_configs, ··· 2041 2035 }; 2042 2036 2043 2037 static const char *stac927x_models[STAC_927X_MODELS] = { 2038 + [STAC_D965_REF_NO_JD] = "ref-no-jd", 2044 2039 [STAC_D965_REF] = "ref", 2045 2040 [STAC_D965_3ST] = "3stack", 2046 2041 [STAC_D965_5ST] = "5stack", ··· 2903 2896 } 2904 2897 2905 2898 if ((spec->multiout.num_dacs - cfg->line_outs) > 0 && 2906 - cfg->hp_outs && !spec->multiout.hp_nid) 2899 + cfg->hp_outs == 1 && !spec->multiout.hp_nid) 2907 2900 spec->multiout.hp_nid = nid; 2908 2901 2909 2902 if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) { ··· 4261 4254 4262 4255 switch (spec->multiout.num_dacs) { 4263 4256 case 0x3: /* 6 Channel */ 4257 + spec->multiout.hp_nid = 0x17; 4264 4258 spec->mixer = stac92hd73xx_6ch_mixer; 4265 4259 spec->init = stac92hd73xx_6ch_core_init; 4266 4260 break; 4267 4261 case 0x4: /* 8 Channel */ 4262 + spec->multiout.hp_nid = 0x18; 4268 4263 spec->mixer = stac92hd73xx_8ch_mixer; 4269 4264 spec->init = stac92hd73xx_8ch_core_init; 4270 4265 break; 4271 4266 case 0x5: /* 10 Channel */ 4267 + spec->multiout.hp_nid = 0x19; 4272 4268 spec->mixer = stac92hd73xx_10ch_mixer; 4273 4269 spec->init = stac92hd73xx_10ch_core_init; 4274 4270 }; ··· 4307 4297 spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP]; 4308 4298 spec->eapd_switch = 0; 4309 4299 spec->num_amps = 1; 4300 + spec->multiout.hp_nid = 0; /* dual HPs */ 4310 4301 4311 4302 if (!spec->init) 4312 4303 spec->init = dell_m6_core_init; ··· 4361 4350 stac92xx_free(codec); 4362 4351 return err; 4363 4352 } 4353 + 4354 + if (spec->board_config == STAC_92HD73XX_NO_JD) 4355 + spec->hp_detect = 0; 4364 4356 4365 4357 codec->patch_ops = stac92xx_patch_ops; 4366 4358 ··· 4912 4898 * in hda_intel.c). 4913 4899 */ 4914 4900 codec->bus->needs_damn_long_delay = 1; 4901 + 4902 + /* no jack detecion for ref-no-jd model */ 4903 + if (spec->board_config == STAC_D965_REF_NO_JD) 4904 + spec->hp_detect = 0; 4915 4905 4916 4906 return 0; 4917 4907 }
+1 -1
sound/soc/omap/omap-pcm.c
··· 233 233 if (ret < 0) 234 234 goto out; 235 235 236 - prtd = kzalloc(sizeof(prtd), GFP_KERNEL); 236 + prtd = kzalloc(sizeof(*prtd), GFP_KERNEL); 237 237 if (prtd == NULL) { 238 238 ret = -ENOMEM; 239 239 goto out;