Commit 436de1e2 authored by Takashi Iwai's avatar Takashi Iwai Committed by Ben Hutchings

ALSA: hda/cirrus - Fix the digital beep registration

commit a86b1a2c upstream.

The argument passed to snd_hda_attach_beep_device() is a widget NID
while spec->beep_amp holds the composed value for amp controls.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent fb3d4562
...@@ -1236,7 +1236,7 @@ static int patch_cxt5045(struct hda_codec *codec) ...@@ -1236,7 +1236,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;
} }
...@@ -2027,7 +2027,7 @@ static int patch_cxt5051(struct hda_codec *codec) ...@@ -2027,7 +2027,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));
conexant_init_jacks(codec); conexant_init_jacks(codec);
if (spec->auto_mic & AUTO_MIC_PORTB) if (spec->auto_mic & AUTO_MIC_PORTB)
...@@ -3225,7 +3225,7 @@ static int patch_cxt5066(struct hda_codec *codec) ...@@ -3225,7 +3225,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;
} }
...@@ -4556,7 +4556,7 @@ static int patch_conexant_auto(struct hda_codec *codec) ...@@ -4556,7 +4556,7 @@ static int patch_conexant_auto(struct hda_codec *codec)
spec->capture_stream = &cx_auto_pcm_analog_capture; spec->capture_stream = &cx_auto_pcm_analog_capture;
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));
return 0; return 0;
} }
......
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