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

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: hda - Don't override ADC definitions for ALC codecs
ALSA: hda - Add missing vmaster initialization for ALC269
ASoC: Add missing DRV_NAME definitions for fsl/* drivers

Linus Torvalds b637dc0d 42c5c843

+18 -6
unified split
+14 -6
sound/pci/hda/patch_realtek.c
··· 13563 set_capture_mixer(spec); 13564 set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); 13565 13566 codec->patch_ops = alc_patch_ops; 13567 if (board_config == ALC269_AUTO) 13568 spec->init_hook = alc269_auto_init; ··· 15579 spec->stream_digital_playback = &alc861vd_pcm_digital_playback; 15580 spec->stream_digital_capture = &alc861vd_pcm_digital_capture; 15581 15582 - spec->adc_nids = alc861vd_adc_nids; 15583 - spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); 15584 - spec->capsrc_nids = alc861vd_capsrc_nids; 15585 15586 set_capture_mixer(spec); 15587 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); ··· 17501 spec->stream_digital_playback = &alc662_pcm_digital_playback; 17502 spec->stream_digital_capture = &alc662_pcm_digital_capture; 17503 17504 - spec->adc_nids = alc662_adc_nids; 17505 - spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); 17506 - spec->capsrc_nids = alc662_capsrc_nids; 17507 17508 if (!spec->cap_mixer) 17509 set_capture_mixer(spec);
··· 13563 set_capture_mixer(spec); 13564 set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); 13565 13566 + spec->vmaster_nid = 0x02; 13567 + 13568 codec->patch_ops = alc_patch_ops; 13569 if (board_config == ALC269_AUTO) 13570 spec->init_hook = alc269_auto_init; ··· 15577 spec->stream_digital_playback = &alc861vd_pcm_digital_playback; 15578 spec->stream_digital_capture = &alc861vd_pcm_digital_capture; 15579 15580 + if (!spec->adc_nids) { 15581 + spec->adc_nids = alc861vd_adc_nids; 15582 + spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); 15583 + } 15584 + if (!spec->capsrc_nids) 15585 + spec->capsrc_nids = alc861vd_capsrc_nids; 15586 15587 set_capture_mixer(spec); 15588 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); ··· 17496 spec->stream_digital_playback = &alc662_pcm_digital_playback; 17497 spec->stream_digital_capture = &alc662_pcm_digital_capture; 17498 17499 + if (!spec->adc_nids) { 17500 + spec->adc_nids = alc662_adc_nids; 17501 + spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); 17502 + } 17503 + if (!spec->capsrc_nids) 17504 + spec->capsrc_nids = alc662_capsrc_nids; 17505 17506 if (!spec->cap_mixer) 17507 set_capture_mixer(spec);
+2
sound/soc/fsl/efika-audio-fabric.c
··· 30 #include "mpc5200_psc_ac97.h" 31 #include "../codecs/stac9766.h" 32 33 static struct snd_soc_device device; 34 static struct snd_soc_card card; 35
··· 30 #include "mpc5200_psc_ac97.h" 31 #include "../codecs/stac9766.h" 32 33 + #define DRV_NAME "efika-audio-fabric" 34 + 35 static struct snd_soc_device device; 36 static struct snd_soc_card card; 37
+2
sound/soc/fsl/pcm030-audio-fabric.c
··· 30 #include "mpc5200_psc_ac97.h" 31 #include "../codecs/wm9712.h" 32 33 static struct snd_soc_device device; 34 static struct snd_soc_card card; 35
··· 30 #include "mpc5200_psc_ac97.h" 31 #include "../codecs/wm9712.h" 32 33 + #define DRV_NAME "pcm030-audio-fabric" 34 + 35 static struct snd_soc_device device; 36 static struct snd_soc_card card; 37