Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 257715
b: refs/heads/master
c: 7ec9c6c
h: refs/heads/master
i:
  257713: 2d1e517
  257711: 9d0af39
v: v3
  • Loading branch information
Takashi Iwai committed Jun 27, 2011
1 parent c110b14 commit c9681a8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 050ea75317f33e376cc413359c0319ad5cc86e2a
refs/heads/master: 7ec9c6ccc6007b14a916021d4ba7ffbcc7822ae3
16 changes: 7 additions & 9 deletions trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -11075,6 +11075,7 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
unsigned int mux_idx;
const struct hda_input_mux *imux;
int conns, mute, idx, item;
unsigned int wid_type;

/* mute ADC */
snd_hda_codec_write(codec, spec->adc_nids[c], 0,
Expand All @@ -11088,6 +11089,7 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
imux = &spec->input_mux[mux_idx];
if (!imux->num_items && mux_idx > 0)
imux = &spec->input_mux[0];
wid_type = get_wcaps_type(get_wcaps(codec, nid));
for (idx = 0; idx < conns; idx++) {
/* if the current connection is the selected one,
* unmute it as default - otherwise mute it
Expand All @@ -11100,17 +11102,13 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
break;
}
}
/* check if we have a selector or mixer
* we could check for the widget type instead, but
* just check for Amp-In presence (in case of mixer
* without amp-in there is something wrong, this
* function shouldn't be used or capsrc nid is wrong)
*/
if (get_wcaps(codec, nid) & AC_WCAP_IN_AMP)
/* initialize the mute status if mute-amp is present */
if (query_amp_caps(codec, nid, HDA_INPUT) & AC_AMPCAP_MUTE)
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_AMP_GAIN_MUTE,
mute);
else if (mute != AMP_IN_MUTE(idx))
if (wid_type == AC_WID_AUD_SEL &&
mute != AMP_IN_MUTE(idx))
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_CONNECT_SEL,
idx);
Expand Down Expand Up @@ -13594,7 +13592,7 @@ static void alc268_auto_init_dac(struct hda_codec *codec, hda_nid_t nid)
if (!nid)
return;
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_OUT_MUTE);
AMP_OUT_ZERO);
}

static void alc268_auto_init_multi_out(struct hda_codec *codec)
Expand Down

0 comments on commit c9681a8

Please sign in to comment.