diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-03-18 06:00:44 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-18 06:00:44 -0400 |
| commit | a86b1a2cd2f81f74e815e07f756edd7bc5b6f034 (patch) | |
| tree | 190285fa705bf21bb96555ffdd169bf88aaa6be1 /sound | |
| parent | 31b6945a899a30f9dffa9cba8ed2e494784810a9 (diff) | |
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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 1051a88f5304..2a89d1eefeb6 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -1142,7 +1142,7 @@ static int patch_cxt5045(struct hda_codec *codec) | |||
| 1142 | } | 1142 | } |
| 1143 | 1143 | ||
| 1144 | if (spec->beep_amp) | 1144 | if (spec->beep_amp) |
| 1145 | snd_hda_attach_beep_device(codec, spec->beep_amp); | 1145 | snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp)); |
| 1146 | 1146 | ||
| 1147 | return 0; | 1147 | return 0; |
| 1148 | } | 1148 | } |
| @@ -1921,7 +1921,7 @@ static int patch_cxt5051(struct hda_codec *codec) | |||
| 1921 | } | 1921 | } |
| 1922 | 1922 | ||
| 1923 | if (spec->beep_amp) | 1923 | if (spec->beep_amp) |
| 1924 | snd_hda_attach_beep_device(codec, spec->beep_amp); | 1924 | snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp)); |
| 1925 | 1925 | ||
| 1926 | return 0; | 1926 | return 0; |
| 1927 | } | 1927 | } |
| @@ -3099,7 +3099,7 @@ static int patch_cxt5066(struct hda_codec *codec) | |||
| 3099 | } | 3099 | } |
| 3100 | 3100 | ||
| 3101 | if (spec->beep_amp) | 3101 | if (spec->beep_amp) |
| 3102 | snd_hda_attach_beep_device(codec, spec->beep_amp); | 3102 | snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp)); |
| 3103 | 3103 | ||
| 3104 | return 0; | 3104 | return 0; |
| 3105 | } | 3105 | } |
| @@ -3397,7 +3397,7 @@ static int patch_conexant_auto(struct hda_codec *codec) | |||
| 3397 | 3397 | ||
| 3398 | codec->patch_ops = cx_auto_patch_ops; | 3398 | codec->patch_ops = cx_auto_patch_ops; |
| 3399 | if (spec->beep_amp) | 3399 | if (spec->beep_amp) |
| 3400 | snd_hda_attach_beep_device(codec, spec->beep_amp); | 3400 | snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp)); |
| 3401 | 3401 | ||
| 3402 | /* Some laptops with Conexant chips show stalls in S3 resume, | 3402 | /* Some laptops with Conexant chips show stalls in S3 resume, |
| 3403 | * which falls into the single-cmd mode. | 3403 | * which falls into the single-cmd mode. |