diff options
author | Lydia Wang <lydiawang@viatech.com.cn> | 2011-03-22 16:21:38 +0800 |
---|---|---|
committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:21:15 -0700 |
commit | 98081a1026dd80b985a084df2678e7d032729f6d (patch) | |
tree | 45dbc0a9bb3b32b0509d36ce20f11d3c3457e5f2 | |
parent | 1171ee52d9bc2940298844b6f485686d75fab25f (diff) |
ALSA: hda - VIA: Fix stereo mixer recording no sound issue
commit bff5fbf50bd498c217994bd2d41a53ac3141185a upstream.
Modify function via_mux_enum_put() to fix stereo mixer recording
no sound issue.
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r-- | sound/pci/hda/patch_via.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 4a749a9dda15..92387d6d8767 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -1091,6 +1091,7 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol, struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct via_spec *spec = codec->spec; unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); + int ret; if (!spec->mux_nids[adc_idx]) return -EINVAL; @@ -1099,12 +1100,14 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol, AC_VERB_GET_POWER_STATE, 0x00) != AC_PWRST_D0) snd_hda_codec_write(codec, spec->mux_nids[adc_idx], 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D0); - /* update jack power state */ - set_jack_power_state(codec); - return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol, + ret = snd_hda_input_mux_put(codec, spec->input_mux, ucontrol, spec->mux_nids[adc_idx], &spec->cur_mux[adc_idx]); + /* update jack power state */ + set_jack_power_state(codec); + + return ret; } static int via_independent_hp_info(struct snd_kcontrol *kcontrol, |