aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKailang Yang <kailang@realtek.com>2010-10-21 02:49:56 -0400
committerTakashi Iwai <tiwai@suse.de>2010-10-21 02:50:50 -0400
commitbf1b022588eba78c990fd58fd2471cd92c2c5683 (patch)
tree2e95d932131b6465f19929170ad69f4744b44ab9 /sound
parent1cc9e8f4c45999e6069f41521d9d391eeeccc3b3 (diff)
ALSA: hda - Add alc_init_jacks() call to other codecs
Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 788ac4bbbba9..2363f1893e88 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -11006,6 +11006,8 @@ static int patch_alc882(struct hda_codec *codec)
11006 codec->patch_ops = alc_patch_ops; 11006 codec->patch_ops = alc_patch_ops;
11007 if (board_config == ALC882_AUTO) 11007 if (board_config == ALC882_AUTO)
11008 spec->init_hook = alc882_auto_init; 11008 spec->init_hook = alc882_auto_init;
11009
11010 alc_init_jacks(codec);
11009#ifdef CONFIG_SND_HDA_POWER_SAVE 11011#ifdef CONFIG_SND_HDA_POWER_SAVE
11010 if (!spec->loopback.amplist) 11012 if (!spec->loopback.amplist)
11011 spec->loopback.amplist = alc882_loopbacks; 11013 spec->loopback.amplist = alc882_loopbacks;
@@ -12914,6 +12916,8 @@ static int patch_alc262(struct hda_codec *codec)
12914 codec->patch_ops = alc_patch_ops; 12916 codec->patch_ops = alc_patch_ops;
12915 if (board_config == ALC262_AUTO) 12917 if (board_config == ALC262_AUTO)
12916 spec->init_hook = alc262_auto_init; 12918 spec->init_hook = alc262_auto_init;
12919
12920 alc_init_jacks(codec);
12917#ifdef CONFIG_SND_HDA_POWER_SAVE 12921#ifdef CONFIG_SND_HDA_POWER_SAVE
12918 if (!spec->loopback.amplist) 12922 if (!spec->loopback.amplist)
12919 spec->loopback.amplist = alc262_loopbacks; 12923 spec->loopback.amplist = alc262_loopbacks;
@@ -13993,6 +13997,8 @@ static int patch_alc268(struct hda_codec *codec)
13993 if (board_config == ALC268_AUTO) 13997 if (board_config == ALC268_AUTO)
13994 spec->init_hook = alc268_auto_init; 13998 spec->init_hook = alc268_auto_init;
13995 13999
14000 alc_init_jacks(codec);
14001
13996 return 0; 14002 return 0;
13997} 14003}
13998 14004
@@ -14359,6 +14365,7 @@ static void alc269_speaker_automute(struct hda_codec *codec)
14359 HDA_AMP_MUTE, bits); 14365 HDA_AMP_MUTE, bits);
14360 snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1, 14366 snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
14361 HDA_AMP_MUTE, bits); 14367 HDA_AMP_MUTE, bits);
14368 alc_report_jack(codec, nid);
14362} 14369}
14363 14370
14364/* unsolicited event for HP jack sensing */ 14371/* unsolicited event for HP jack sensing */
@@ -14695,7 +14702,6 @@ static void alc269_auto_init(struct hda_codec *codec)
14695 alc269_auto_init_hp_out(codec); 14702 alc269_auto_init_hp_out(codec);
14696 alc269_auto_init_analog_input(codec); 14703 alc269_auto_init_analog_input(codec);
14697 alc_auto_init_digital(codec); 14704 alc_auto_init_digital(codec);
14698 alc_init_jacks(codec);
14699 if (spec->unsol_event) 14705 if (spec->unsol_event)
14700 alc_inithook(codec); 14706 alc_inithook(codec);
14701} 14707}
@@ -15128,6 +15134,8 @@ static int patch_alc269(struct hda_codec *codec)
15128#endif 15134#endif
15129 if (board_config == ALC269_AUTO) 15135 if (board_config == ALC269_AUTO)
15130 spec->init_hook = alc269_auto_init; 15136 spec->init_hook = alc269_auto_init;
15137
15138 alc_init_jacks(codec);
15131#ifdef CONFIG_SND_HDA_POWER_SAVE 15139#ifdef CONFIG_SND_HDA_POWER_SAVE
15132 if (!spec->loopback.amplist) 15140 if (!spec->loopback.amplist)
15133 spec->loopback.amplist = alc269_loopbacks; 15141 spec->loopback.amplist = alc269_loopbacks;
@@ -19393,6 +19401,8 @@ static int patch_alc662(struct hda_codec *codec)
19393 alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 0); 19401 alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 0);
19394 } 19402 }
19395 19403
19404 alc_init_jacks(codec);
19405
19396#ifdef CONFIG_SND_HDA_POWER_SAVE 19406#ifdef CONFIG_SND_HDA_POWER_SAVE
19397 if (!spec->loopback.amplist) 19407 if (!spec->loopback.amplist)
19398 spec->loopback.amplist = alc662_loopbacks; 19408 spec->loopback.amplist = alc662_loopbacks;