UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Takashi Iwai 2013-03-18 11:00:44 +01:00
parent 31b6945a89
commit a86b1a2cd2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/pci/hda/patch_conexant.c
View File

@ -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)
} }
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)
} }
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)
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.