Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 189966
b: refs/heads/master
c: 7f311a4
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai committed Apr 9, 2010
1 parent 37edd17 commit daa3c07
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 226b1ec8c18bcb6d1aa448a29b2c8aeae1946228
refs/heads/master: 7f311a46916a3be00a1a8e3f1bdf461d08f1d263
23 changes: 23 additions & 0 deletions trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -4809,6 +4809,25 @@ static void alc880_auto_init_analog_input(struct hda_codec *codec)
}
}

static void alc880_auto_init_input_src(struct hda_codec *codec)
{
struct alc_spec *spec = codec->spec;
int c;

for (c = 0; c < spec->num_adc_nids; c++) {
unsigned int mux_idx;
const struct hda_input_mux *imux;
mux_idx = c >= spec->num_mux_defs ? 0 : c;
imux = &spec->input_mux[mux_idx];
if (!imux->num_items && mux_idx > 0)
imux = &spec->input_mux[0];
if (imux)
snd_hda_codec_write(codec, spec->adc_nids[c], 0,
AC_VERB_SET_CONNECT_SEL,
imux->items[0].index);
}
}

/* parse the BIOS configuration and set up the alc_spec */
/* return 1 if successful, 0 if the proper config is not found,
* or a negative error code
Expand Down Expand Up @@ -4887,6 +4906,7 @@ static void alc880_auto_init(struct hda_codec *codec)
alc880_auto_init_multi_out(codec);
alc880_auto_init_extra_out(codec);
alc880_auto_init_analog_input(codec);
alc880_auto_init_input_src(codec);
if (spec->unsol_event)
alc_inithook(codec);
}
Expand Down Expand Up @@ -6398,6 +6418,8 @@ static void alc260_auto_init_analog_input(struct hda_codec *codec)
}
}

#define alc260_auto_init_input_src alc880_auto_init_input_src

/*
* generic initialization of ADC, input mixers and output mixers
*/
Expand Down Expand Up @@ -6484,6 +6506,7 @@ static void alc260_auto_init(struct hda_codec *codec)
struct alc_spec *spec = codec->spec;
alc260_auto_init_multi_out(codec);
alc260_auto_init_analog_input(codec);
alc260_auto_init_input_src(codec);
if (spec->unsol_event)
alc_inithook(codec);
}
Expand Down

0 comments on commit daa3c07

Please sign in to comment.