diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-02-20 09:47:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-02-20 09:50:20 -0500 |
commit | 589876e243bb14343d09d9fd7f9ddf79f1d80158 (patch) | |
tree | 81d4ffe1cf9a1f13227fb2776a7da19227d02584 /sound | |
parent | b9368f5c10b15f2b79a58666849827edc1f2f3d4 (diff) |
ALSA: hda/realtek - Apply probe-fixup really after probing
Move the call of alc_apply_fixup() with ALC_FIXUP_ACT_PROBE after the
whole setups of patch_ops & co, so that the fix-up function may override
the default setup. This will be needed for installing the own unsol
event handler (e.g. for volume-knob controls).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e6eec9a9ab47..895113ee3857 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -4566,8 +4566,6 @@ static int patch_alc880(struct hda_codec *codec) | |||
4566 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); | 4566 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); |
4567 | } | 4567 | } |
4568 | 4568 | ||
4569 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
4570 | |||
4571 | codec->patch_ops = alc_patch_ops; | 4569 | codec->patch_ops = alc_patch_ops; |
4572 | if (board_config == ALC_MODEL_AUTO) | 4570 | if (board_config == ALC_MODEL_AUTO) |
4573 | spec->init_hook = alc_auto_init_std; | 4571 | spec->init_hook = alc_auto_init_std; |
@@ -4578,6 +4576,8 @@ static int patch_alc880(struct hda_codec *codec) | |||
4578 | spec->loopback.amplist = alc880_loopbacks; | 4576 | spec->loopback.amplist = alc880_loopbacks; |
4579 | #endif | 4577 | #endif |
4580 | 4578 | ||
4579 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
4580 | |||
4581 | return 0; | 4581 | return 0; |
4582 | 4582 | ||
4583 | error: | 4583 | error: |
@@ -4749,8 +4749,6 @@ static int patch_alc260(struct hda_codec *codec) | |||
4749 | set_beep_amp(spec, 0x07, 0x05, HDA_INPUT); | 4749 | set_beep_amp(spec, 0x07, 0x05, HDA_INPUT); |
4750 | } | 4750 | } |
4751 | 4751 | ||
4752 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
4753 | |||
4754 | codec->patch_ops = alc_patch_ops; | 4752 | codec->patch_ops = alc_patch_ops; |
4755 | spec->init_hook = alc_auto_init_std; | 4753 | spec->init_hook = alc_auto_init_std; |
4756 | spec->shutup = alc_eapd_shutup; | 4754 | spec->shutup = alc_eapd_shutup; |
@@ -4759,6 +4757,8 @@ static int patch_alc260(struct hda_codec *codec) | |||
4759 | spec->loopback.amplist = alc260_loopbacks; | 4757 | spec->loopback.amplist = alc260_loopbacks; |
4760 | #endif | 4758 | #endif |
4761 | 4759 | ||
4760 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
4761 | |||
4762 | return 0; | 4762 | return 0; |
4763 | 4763 | ||
4764 | error: | 4764 | error: |
@@ -5165,8 +5165,6 @@ static int patch_alc882(struct hda_codec *codec) | |||
5165 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); | 5165 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); |
5166 | } | 5166 | } |
5167 | 5167 | ||
5168 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
5169 | |||
5170 | codec->patch_ops = alc_patch_ops; | 5168 | codec->patch_ops = alc_patch_ops; |
5171 | if (board_config == ALC_MODEL_AUTO) | 5169 | if (board_config == ALC_MODEL_AUTO) |
5172 | spec->init_hook = alc_auto_init_std; | 5170 | spec->init_hook = alc_auto_init_std; |
@@ -5178,6 +5176,8 @@ static int patch_alc882(struct hda_codec *codec) | |||
5178 | spec->loopback.amplist = alc882_loopbacks; | 5176 | spec->loopback.amplist = alc882_loopbacks; |
5179 | #endif | 5177 | #endif |
5180 | 5178 | ||
5179 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
5180 | |||
5181 | return 0; | 5181 | return 0; |
5182 | 5182 | ||
5183 | error: | 5183 | error: |
@@ -5331,8 +5331,6 @@ static int patch_alc262(struct hda_codec *codec) | |||
5331 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); | 5331 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); |
5332 | } | 5332 | } |
5333 | 5333 | ||
5334 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
5335 | |||
5336 | codec->patch_ops = alc_patch_ops; | 5334 | codec->patch_ops = alc_patch_ops; |
5337 | spec->init_hook = alc_auto_init_std; | 5335 | spec->init_hook = alc_auto_init_std; |
5338 | spec->shutup = alc_eapd_shutup; | 5336 | spec->shutup = alc_eapd_shutup; |
@@ -5342,6 +5340,8 @@ static int patch_alc262(struct hda_codec *codec) | |||
5342 | spec->loopback.amplist = alc262_loopbacks; | 5340 | spec->loopback.amplist = alc262_loopbacks; |
5343 | #endif | 5341 | #endif |
5344 | 5342 | ||
5343 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
5344 | |||
5345 | return 0; | 5345 | return 0; |
5346 | 5346 | ||
5347 | error: | 5347 | error: |
@@ -5992,8 +5992,6 @@ static int patch_alc269(struct hda_codec *codec) | |||
5992 | set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); | 5992 | set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); |
5993 | } | 5993 | } |
5994 | 5994 | ||
5995 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
5996 | |||
5997 | codec->patch_ops = alc_patch_ops; | 5995 | codec->patch_ops = alc_patch_ops; |
5998 | #ifdef CONFIG_PM | 5996 | #ifdef CONFIG_PM |
5999 | codec->patch_ops.resume = alc269_resume; | 5997 | codec->patch_ops.resume = alc269_resume; |
@@ -6008,6 +6006,8 @@ static int patch_alc269(struct hda_codec *codec) | |||
6008 | codec->patch_ops.check_power_status = alc269_mic2_mute_check_ps; | 6006 | codec->patch_ops.check_power_status = alc269_mic2_mute_check_ps; |
6009 | #endif | 6007 | #endif |
6010 | 6008 | ||
6009 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
6010 | |||
6011 | return 0; | 6011 | return 0; |
6012 | 6012 | ||
6013 | error: | 6013 | error: |
@@ -6146,8 +6146,6 @@ static int patch_alc861(struct hda_codec *codec) | |||
6146 | set_beep_amp(spec, 0x23, 0, HDA_OUTPUT); | 6146 | set_beep_amp(spec, 0x23, 0, HDA_OUTPUT); |
6147 | } | 6147 | } |
6148 | 6148 | ||
6149 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
6150 | |||
6151 | codec->patch_ops = alc_patch_ops; | 6149 | codec->patch_ops = alc_patch_ops; |
6152 | spec->init_hook = alc_auto_init_std; | 6150 | spec->init_hook = alc_auto_init_std; |
6153 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 6151 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
@@ -6156,6 +6154,8 @@ static int patch_alc861(struct hda_codec *codec) | |||
6156 | spec->loopback.amplist = alc861_loopbacks; | 6154 | spec->loopback.amplist = alc861_loopbacks; |
6157 | #endif | 6155 | #endif |
6158 | 6156 | ||
6157 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
6158 | |||
6159 | return 0; | 6159 | return 0; |
6160 | 6160 | ||
6161 | error: | 6161 | error: |
@@ -6270,8 +6270,6 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
6270 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); | 6270 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); |
6271 | } | 6271 | } |
6272 | 6272 | ||
6273 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
6274 | |||
6275 | codec->patch_ops = alc_patch_ops; | 6273 | codec->patch_ops = alc_patch_ops; |
6276 | 6274 | ||
6277 | spec->init_hook = alc_auto_init_std; | 6275 | spec->init_hook = alc_auto_init_std; |
@@ -6281,6 +6279,8 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
6281 | spec->loopback.amplist = alc861vd_loopbacks; | 6279 | spec->loopback.amplist = alc861vd_loopbacks; |
6282 | #endif | 6280 | #endif |
6283 | 6281 | ||
6282 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
6283 | |||
6284 | return 0; | 6284 | return 0; |
6285 | 6285 | ||
6286 | error: | 6286 | error: |
@@ -6659,8 +6659,6 @@ static int patch_alc662(struct hda_codec *codec) | |||
6659 | } | 6659 | } |
6660 | } | 6660 | } |
6661 | 6661 | ||
6662 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
6663 | |||
6664 | codec->patch_ops = alc_patch_ops; | 6662 | codec->patch_ops = alc_patch_ops; |
6665 | spec->init_hook = alc_auto_init_std; | 6663 | spec->init_hook = alc_auto_init_std; |
6666 | spec->shutup = alc_eapd_shutup; | 6664 | spec->shutup = alc_eapd_shutup; |
@@ -6670,6 +6668,8 @@ static int patch_alc662(struct hda_codec *codec) | |||
6670 | spec->loopback.amplist = alc662_loopbacks; | 6668 | spec->loopback.amplist = alc662_loopbacks; |
6671 | #endif | 6669 | #endif |
6672 | 6670 | ||
6671 | alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE); | ||
6672 | |||
6673 | return 0; | 6673 | return 0; |
6674 | 6674 | ||
6675 | error: | 6675 | error: |