sound fixes
Linus,
please pull ALSA fixes for v2.6.31-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
containing the following trivial fixes.
Thanks!
Takashi
===
Takashi Iwai (3):
ASoC: Add missing DRV_NAME definitions for fsl/* drivers
ALSA: hda - Add missing vmaster initialization for ALC269
ALSA: hda - Don't override ADC definitions for ALC codecs
--- sound/pci/hda/patch_realtek.c | 20 ++++++++++++++------ sound/soc/fsl/efika-audio-fabric.c | 2 ++ sound/soc/fsl/pcm030-audio-fabric.c | 2 ++ 3 files changed, 18 insertions(+), 6 deletions(-)
sound/pci/hda/patch_realtek.c +14 -6
@@ -13563,6 +13563,8 @@ static int patch_alc269(struct hda_codec *codec)set_capture_mixer (spec);set_beep_amp (spec,0x0b ,0x04 ,HDA_INPUT ); + spec->vmaster_nid =0x02 ; + codec->patch_ops = alc_patch_ops;if (board_config ==ALC269_AUTO ) spec->init_hook = alc269_auto_init;
@@ -15577,9 +15579,12 @@ static int patch_alc861vd(struct hda_codec *codec) spec->stream_digital_playback = &alc861vd_pcm_digital_playback; spec->stream_digital_capture = &alc861vd_pcm_digital_capture; - spec->adc_nids = alc861vd_adc_nids; - spec->num_adc_nids =ARRAY_SIZE (alc861vd_adc_nids); - spec->capsrc_nids = alc861vd_capsrc_nids; +if (!spec->adc_nids) { + spec->adc_nids = alc861vd_adc_nids; + spec->num_adc_nids =ARRAY_SIZE (alc861vd_adc_nids); + } +if (!spec->capsrc_nids) + spec->capsrc_nids = alc861vd_capsrc_nids;set_capture_mixer (spec);set_beep_amp (spec,0x0b ,0x05 ,HDA_INPUT );
@@ -17496,9 +17501,12 @@ static int patch_alc662(struct hda_codec *codec) spec->stream_digital_playback = &alc662_pcm_digital_playback; spec->stream_digital_capture = &alc662_pcm_digital_capture; - spec->adc_nids = alc662_adc_nids; - spec->num_adc_nids =ARRAY_SIZE (alc662_adc_nids); - spec->capsrc_nids = alc662_capsrc_nids; +if (!spec->adc_nids) { + spec->adc_nids = alc662_adc_nids; + spec->num_adc_nids =ARRAY_SIZE (alc662_adc_nids); + } +if (!spec->capsrc_nids) + spec->capsrc_nids = alc662_capsrc_nids;if (!spec->cap_mixer)set_capture_mixer (spec);
sound/soc/fsl/efika-audio-fabric.c +2 -0
@@ -30,6 +30,8 @@#include "mpc5200_psc_ac97.h" #include "../codecs/stac9766.h" +#define DRV_NAME "efika-audio-fabric" +static struct snd_soc_device device;static struct snd_soc_card card;
sound/soc/fsl/pcm030-audio-fabric.c +2 -0
@@ -30,6 +30,8 @@#include "mpc5200_psc_ac97.h" #include "../codecs/wm9712.h" +#define DRV_NAME "pcm030-audio-fabric" +static struct snd_soc_device device;static struct snd_soc_card card;
Quoted 6 lines · Takashi Iwai
please pull ALSA fixes for v2.6.31-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.gitfor-linuscontaining the following trivial fixes.
Nothing there. Forgot to push?
Linus
At Wed, 12 Aug 2009 08:23:19 -0700 (PDT),
Quoted 5 lines · Linus Torvalds
Quoted 1 line · Takashi Iwai
Quoted 7 lines
Quoted 5 lines
please pull ALSA fixes for v2.6.31-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.gitfor-linuscontaining the following trivial fixes.
Nothing there. Forgot to push?
Doh, indeed. Pushed now.
Sorry for inconvenience!
Takashi