Commit a86b1a2c authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda/cirrus - Fix the digital beep registration

The argument passed to snd_hda_attach_beep_device() is a widget NID
while spec->beep_amp holds the composed value for amp controls.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 31b6945a
...@@ -1142,7 +1142,7 @@ static int patch_cxt5045(struct hda_codec *codec) ...@@ -1142,7 +1142,7 @@ static int patch_cxt5045(struct hda_codec *codec)
} }
if (spec->beep_amp) if (spec->beep_amp)
snd_hda_attach_beep_device(codec, spec->beep_amp); snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));
return 0; return 0;
} }
...@@ -1921,7 +1921,7 @@ static int patch_cxt5051(struct hda_codec *codec) ...@@ -1921,7 +1921,7 @@ static int patch_cxt5051(struct hda_codec *codec)
} }
if (spec->beep_amp) if (spec->beep_amp)
snd_hda_attach_beep_device(codec, spec->beep_amp); snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));
return 0; return 0;
} }
...@@ -3099,7 +3099,7 @@ static int patch_cxt5066(struct hda_codec *codec) ...@@ -3099,7 +3099,7 @@ static int patch_cxt5066(struct hda_codec *codec)
} }
if (spec->beep_amp) if (spec->beep_amp)
snd_hda_attach_beep_device(codec, spec->beep_amp); snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));
return 0; return 0;
} }
...@@ -3397,7 +3397,7 @@ static int patch_conexant_auto(struct hda_codec *codec) ...@@ -3397,7 +3397,7 @@ static int patch_conexant_auto(struct hda_codec *codec)
codec->patch_ops = cx_auto_patch_ops; codec->patch_ops = cx_auto_patch_ops;
if (spec->beep_amp) if (spec->beep_amp)
snd_hda_attach_beep_device(codec, spec->beep_amp); snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));
/* Some laptops with Conexant chips show stalls in S3 resume, /* Some laptops with Conexant chips show stalls in S3 resume,
* which falls into the single-cmd mode. * which falls into the single-cmd mode.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment