aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_conexant.c
diff options
context:
space:
mode:
authorGregorio Guidi <gregorio.guidi@gmail.com>2009-03-12 11:41:51 -0400
committerTakashi Iwai <tiwai@suse.de>2009-03-12 11:41:51 -0400
commit5d75bc557859805f00eeddb09d7cc8ffc7e5334e (patch)
treee87ccc88a462471680bf8793994cb91a9ad370c3 /sound/pci/hda/patch_conexant.c
parentdf481e41b963b7fc3d7e3543a0c7bb140a682146 (diff)
ALSA: hda - fix headphone settings and master volume (Conexant CX20551)
Update the places where the 0x1d widget is used for Conexant 5047, fixing mismatch introduced after changing the connection. Signed-off-by: Gregorio Guidi <gregorio.guidi@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
-rw-r--r--sound/pci/hda/patch_conexant.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index d60ccb5bb127..6cb184e9c2f1 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1196,7 +1196,7 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol,
1196 * the headphone jack 1196 * the headphone jack
1197 */ 1197 */
1198 bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE; 1198 bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE;
1199 snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0, 1199 snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01,
1200 HDA_AMP_MUTE, bits); 1200 HDA_AMP_MUTE, bits);
1201 bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE; 1201 bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE;
1202 snd_hda_codec_amp_stereo(codec, 0x13, HDA_OUTPUT, 0, 1202 snd_hda_codec_amp_stereo(codec, 0x13, HDA_OUTPUT, 0,
@@ -1214,7 +1214,7 @@ static void cxt5047_hp_automute(struct hda_codec *codec)
1214 AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; 1214 AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
1215 1215
1216 bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0; 1216 bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0;
1217 snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0, 1217 snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01,
1218 HDA_AMP_MUTE, bits); 1218 HDA_AMP_MUTE, bits);
1219} 1219}
1220 1220
@@ -1276,7 +1276,7 @@ static struct snd_kcontrol_new cxt5047_base_mixers[] = {
1276}; 1276};
1277 1277
1278static struct snd_kcontrol_new cxt5047_hp_spk_mixers[] = { 1278static struct snd_kcontrol_new cxt5047_hp_spk_mixers[] = {
1279 HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x00, HDA_OUTPUT), 1279 HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x01, HDA_OUTPUT),
1280 HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT), 1280 HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT),
1281 {} 1281 {}
1282}; 1282};