leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: hda - No analog mix input source as default for IDT92HD71bxx

Browse Source 
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>
This commit is contained in:
Takashi Iwai 2009-07-29 18:41:29 +02:00
parent 15b4f296fc
commit 71443b0b74
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/pci/hda/patch_sigmatel.c
View File

@ -5481,8 +5481,6 @@ again:
} }
break; break;
case 0x111d7608: /* 5 Port with Analog Mixer */ case 0x111d7608: /* 5 Port with Analog Mixer */
memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
sizeof(stac92hd71bxx_dmux_amixer));
spec->private_dimux.num_items--; spec->private_dimux.num_items--;
switch (spec->board_config) { switch (spec->board_config) {
case STAC_HP_M4: case STAC_HP_M4:
@ -5505,9 +5503,15 @@ again:
/* no output amps */ /* no output amps */
spec->num_pwrs = 0; 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; 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 */ /* disable VSW */
spec->init = stac92hd71bxx_core_init; spec->init = stac92hd71bxx_core_init;
unmute_init++; unmute_init++;
@ -5531,10 +5535,15 @@ again:
spec->num_pwrs = 0; spec->num_pwrs = 0;
/* fallthru */ /* fallthru */
default: default:
memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer, if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) {
sizeof(stac92hd71bxx_dmux_amixer));
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1)
spec->mixer = stac92hd71bxx_analog_mixer; 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; spec->init = stac92hd71bxx_core_init;
codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
spec->num_dmics = stac92hd71bxx_connected_ports(codec, spec->num_dmics = stac92hd71bxx_connected_ports(codec,