summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-13 15:41:45 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-13 15:42:53 +0100
commit5870112021fb38e73b25dad3baec4ca0819c594a (patch)
treea83ea912a4480e49ed76e2053cc896d38e14ea13 /sound
parentb5bfbc670283d1ff21df4cd3f9f036cc47e34ce4 (diff)
downloadlinux-5870112021fb38e73b25dad3baec4ca0819c594a.tar.gz
linux-5870112021fb38e73b25dad3baec4ca0819c594a.tar.bz2
linux-5870112021fb38e73b25dad3baec4ca0819c594a.zip
ALSA: hda - Add fixup-call in init callback
In some cases, the fix-up is required in the init callback to be called both at the first initialization and at the resume. The new action type ALC_FIXUP_ACT_INIT is used for this case. So far, only ALC275_FIXUP_SONY_HWEQ uses this. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a06c9437cdeb..b445ae989421 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1714,6 +1714,7 @@ enum {
enum {
ALC_FIXUP_ACT_PRE_PROBE,
ALC_FIXUP_ACT_PROBE,
+ ALC_FIXUP_ACT_INIT,
};
static void alc_apply_fixup(struct hda_codec *codec, int action)
@@ -3910,6 +3911,8 @@ static int alc_init(struct hda_codec *codec)
if (spec->init_hook)
spec->init_hook(codec);
+ alc_apply_fixup(codec, ALC_FIXUP_ACT_INIT);
+
hda_call_check_power_status(codec, 0x01);
return 0;
}
@@ -14871,7 +14874,7 @@ static void alc269_fixup_hweq(struct hda_codec *codec,
{
int coef;
- if (action != ALC_FIXUP_ACT_PROBE)
+ if (action != ALC_FIXUP_ACT_INIT)
return;
coef = alc_read_coef_idx(codec, 0x1e);
alc_write_coef_idx(codec, 0x1e, coef | 0x80);