Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 07:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda - Fix memory leaks in the previous patch

Browse Source 
The previous hack for replacing the codec name give memory leaks at
error paths.  This patch fixes them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2009-12-03 10:14:10 +01:00
parent 274693f370
commit ac2c92e0cd
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13459,8 +13459,10 @@ static int patch_alc269(struct hda_codec *codec)
if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010){
kfree(codec->chip_name);
codec->chip_name = kstrdup("ALC259", GFP_KERNEL);
if (!codec->chip_name)
if (!codec->chip_name) {
alc_free(codec);
return -ENOMEM;
}
}
board_config = snd_hda_check_board_config(codec, ALC269_MODEL_LAST,
@ -17465,8 +17467,10 @@ static int patch_alc662(struct hda_codec *codec)
if (alc_read_coef_idx(codec, 0)==0x8020){
kfree(codec->chip_name);
codec->chip_name = kstrdup("ALC661", GFP_KERNEL);
if (!codec->chip_name)
if (!codec->chip_name) {
alc_free(codec);
return -ENOMEM;
}
}
board_config = snd_hda_check_board_config(codec, ALC662_MODEL_LAST,
@ -17540,13 +17544,13 @@ static int patch_alc888(struct hda_codec *codec)
if ((alc_read_coef_idx(codec, 0) & 0x00f0)==0x0030){
kfree(codec->chip_name);
codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL);
if (!codec->chip_name)
if (!codec->chip_name) {
alc_free(codec);
return -ENOMEM;
patch_alc662(codec);
} else {
patch_alc882(codec);
}
return patch_alc662(codec);
}
return 0;
return patch_alc882(codec);
}
/*