[1/2] ALSA: hda - Apply ALC269_FIXUP_NO_SHUTUP on HDA_FIXUP_ACT_PROBE
diff mbox

Message ID 20161224185001.26824-1-gabriele.mzt@gmail.com
State New
Headers show

Commit Message

Gabriele Mazzotta Dec. 24, 2016, 6:50 p.m. UTC
Setting shutup when the action is HDA_FIXUP_ACT_PRE_PROBE might
not have the desired effect since it could be overridden by
another more generic shutup function. Prevent this by setting
the more specific shutup function on HDA_FIXUP_ACT_PROBE.

Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
---
 sound/pci/hda/patch_realtek.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Takashi Iwai Dec. 28, 2016, 3:14 p.m. UTC | #1
On Sat, 24 Dec 2016 19:50:00 +0100,
Gabriele Mazzotta wrote:
> 
> Setting shutup when the action is HDA_FIXUP_ACT_PRE_PROBE might
> not have the desired effect since it could be overridden by
> another more generic shutup function. Prevent this by setting
> the more specific shutup function on HDA_FIXUP_ACT_PROBE.
> 
> Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>

Applied both patches now.  Thanks.


Takashi

> ---
>  sound/pci/hda/patch_realtek.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index ea81c08ddc7a..d30cc49512e4 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -4400,7 +4400,7 @@ static void alc_no_shutup(struct hda_codec *codec)
>  static void alc_fixup_no_shutup(struct hda_codec *codec,
>  				const struct hda_fixup *fix, int action)
>  {
> -	if (action == HDA_FIXUP_ACT_PRE_PROBE) {
> +	if (action == HDA_FIXUP_ACT_PROBE) {
>  		struct alc_spec *spec = codec->spec;
>  		spec->shutup = alc_no_shutup;
>  	}
> -- 
> 2.11.0
> 
>

Patch
diff mbox

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index ea81c08ddc7a..d30cc49512e4 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4400,7 +4400,7 @@  static void alc_no_shutup(struct hda_codec *codec)
 static void alc_fixup_no_shutup(struct hda_codec *codec,
 				const struct hda_fixup *fix, int action)
 {
-	if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+	if (action == HDA_FIXUP_ACT_PROBE) {
 		struct alc_spec *spec = codec->spec;
 		spec->shutup = alc_no_shutup;
 	}