sound fixes
Linus,
please pull sound fixes for v2.6.34-rc3 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
A couple of one-liner quirks, in addition to a fix of a regression introduced in 2.6.34-rc1 with CONFIG_SND_DEBUG_*=n kconfig.
Thanks!
Takashi
===
Daniel Chen (1):
ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist
Daniel T Chen (2):
ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist
ALSA: hda: Use LPIB for ga-ma770-ud3 board
Jarkko Nikula (1):
ALSA: pcm_lib - fix xrun functionality
Takashi Iwai (1):
ALSA: hda - Don't set invalid connection index in Realtek initialiaiton
--- sound/core/pcm_lib.c | 6 ++++-- sound/pci/ac97/ac97_patch.c | 2 ++ sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_realtek.c | 5 ++++- 4 files changed, 11 insertions(+), 3 deletions(-)
sound/core/pcm_lib.c +4 -2
@@ -148,6 +148,9 @@ static void pcm_debug_name(struct snd_pcm_substream *substream,#define xrun_debug (substream, mask) \ ((substream)->pstr->xrun_debug & (mask)) +#else +#define xrun_debug (substream, mask) 0 +#endif #define dump_stack_on_xrun (substream) do { \ if (xrun_debug(substream, XRUN_DEBUG_STACK)) \
@@ -169,6 +172,7 @@ static void xrun(struct snd_pcm_substream *substream) } } +#ifdef CONFIG_SND_PCM_XRUN_DEBUG #define hw_ptr_error(substream, fmt, args...) \ do { \ if (xrun_debug(substream, XRUN_DEBUG_BASIC)) { \
@@ -255,8 +259,6 @@ static void xrun_log_show(struct snd_pcm_substream *substream)#else /* ! CONFIG_SND_PCM_XRUN_DEBUG */ -#define xrun_debug (substream, mask) 0 -#define xrun (substream) do { } while (0) #define hw_ptr_error(substream, fmt, args...) do { } while (0)#define xrun_log (substream, pos) do { } while (0)#define xrun_log_show (substream) do { } while (0)
sound/pci/ac97/ac97_patch.c +2 -0
@@ -1852,12 +1852,14 @@ static unsigned int ad1981_jacks_blacklist[] = {0x10140523 ,/* Thinkpad R40 */ 0x10140534 ,/* Thinkpad X31 */ 0x10140537 ,/* Thinkpad T41p */ +0x1014053e ,/* Thinkpad R40e */ 0x10140554 ,/* Thinkpad T42p/R50p */ 0x10140567 ,/* Thinkpad T43p 2668-G7U */ 0x10140581 ,/* Thinkpad X41-2527 */ 0x10280160 ,/* Dell Dimension 2400 */ 0x104380b0 ,/* Asus A7V8X-MX */ 0x11790241 ,/* Toshiba Satellite A-15 S127 */ +0x1179ff10 ,/* Toshiba P500 */ 0x144dc01a ,/* Samsung NP-X20C004/SEG */ 0 /* end */ };
sound/pci/hda/hda_intel.c +1 -0
@@ -2269,6 +2269,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {SND_PCI_QUIRK (0x103c ,0x306d ,"HP dv3" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1106 ,0x3288 ,"ASUS M2V-MX SE" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1043 ,0x813d ,"ASUS P5AD2" ,POS_FIX_LPIB ), +SND_PCI_QUIRK (0x1458 ,0xa022 ,"ga-ma770-ud3" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1462 ,0x1002 ,"MSI Wind U115" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1565 ,0x820f ,"Biostar Microtech" ,POS_FIX_LPIB ), SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),
sound/pci/hda/patch_realtek.c +4 -1
@@ -10043,8 +10043,11 @@ static void alc882_auto_set_output_and_unmute(struct hda_codec *codec,alc_set_pin_output (codec, nid, pin_type);if (spec->multiout.dac_nids[dac_idx] ==0x25 ) idx =4 ; -else +else { +if (spec->multiout.num_dacs >= dac_idx) +return ; idx = spec->multiout.dac_nids[dac_idx] -2 ; + }snd_hda_codec_write (codec, nid,0 ,AC_VERB_SET_CONNECT_SEL , idx); }