leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: hda/realtek - Use alc_codec_rename()

Browse Source 
Replaced with alc_codec_rename() in all possible places.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2011-10-17 16:07:43 +02:00
parent 801f49d3b8
commit 84db9150b6
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/pci/hda/patch_realtek.c
View File

@ -5678,10 +5678,10 @@ static int patch_alc888(struct hda_codec *codec)
if ((coef & 0x00f0) == 0x0030) {
kfree(codec->chip_name);
if (codec->vendor_id == 0x10ec0887)
codec->chip_name = kstrdup("ALC887-VD", GFP_KERNEL);
err = alc_codec_rename(codec, "ALC887-VD");
else
codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL);
if (!codec->chip_name) {
err = alc_codec_rename(codec, "ALC888-VD");
if (err < 0) {
alc_free(codec);
return -ENOMEM;
}
@ -5691,9 +5691,8 @@ static int patch_alc888(struct hda_codec *codec)
/* For ALC888S-VC */
if (codec->vendor_id == 0x10ec0888) {
if ((coef & 0xf0f0) == 0x3020) {
kfree(codec->chip_name);
codec->chip_name = kstrdup("ALC886", GFP_KERNEL);
if (!codec->chip_name) {
err = alc_codec_rename(codec, "ALC886");
if (err < 0) {
alc_free(codec);
return -ENOMEM;
}
@ -5705,8 +5704,10 @@ static int patch_alc888(struct hda_codec *codec)
static int patch_alc899(struct hda_codec *codec)
{
if ((alc_read_coef_idx(codec, 0) & 0x2000) != 0x2000) {
kfree(codec->chip_name);
codec->chip_name = kstrdup("ALC898", GFP_KERNEL);
if (alc_codec_rename(codec, "ALC898") < 0) {
alc_free(codec);
return -ENOMEM;
}
}
return patch_alc882(codec);
}