Skip to content

Commit

Permalink
ALSA: hda - No analog mix input source as default for IDT92HD71bxx
Browse files Browse the repository at this point in the history
The analog mix is disabled now as default (unless "analog_mixer" hint
is given), so it shoudn't appear in the digital input source as well.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jul 29, 2009
1 parent 15b4f29 commit 71443b0
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -5481,8 +5481,6 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
}
break;
case 0x111d7608: /* 5 Port with Analog Mixer */
memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
sizeof(stac92hd71bxx_dmux_amixer));
spec->private_dimux.num_items--;
switch (spec->board_config) {
case STAC_HP_M4:
Expand All @@ -5505,9 +5503,15 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)

/* no output amps */
spec->num_pwrs = 0;
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1)
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) {
spec->mixer = stac92hd71bxx_analog_mixer;

memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
sizeof(stac92hd71bxx_dmux_amixer));
} else {
memcpy(&spec->private_dimux,
&stac92hd71bxx_dmux_nomixer,
sizeof(stac92hd71bxx_dmux_nomixer));
}
/* disable VSW */
spec->init = stac92hd71bxx_core_init;
unmute_init++;
Expand All @@ -5531,10 +5535,15 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
spec->num_pwrs = 0;
/* fallthru */
default:
memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
sizeof(stac92hd71bxx_dmux_amixer));
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1)
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) {
spec->mixer = stac92hd71bxx_analog_mixer;
memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
sizeof(stac92hd71bxx_dmux_amixer));
} else {
memcpy(&spec->private_dimux,
&stac92hd71bxx_dmux_nomixer,
sizeof(stac92hd71bxx_dmux_nomixer));
}
spec->init = stac92hd71bxx_core_init;
codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
spec->num_dmics = stac92hd71bxx_connected_ports(codec,
Expand Down

0 comments on commit 71443b0

Please sign in to comment.