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

ASoC: core: tidyup snd_soc_register_codec() fail case

Browse Source 
kfree() on snd_soc_register_codec() was summarized to one place.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2013-02-25 00:40:09 -08:00 committed by Mark Brown
parent 6dbe51c251
commit f790b94d78
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/soc-core.c
View File

@ -4022,8 +4022,8 @@ int snd_soc_register_codec(struct device *dev,
/* create CODEC component name */ /* create CODEC component name */
codec->name = fmt_single_name(dev, &codec->id); codec->name = fmt_single_name(dev, &codec->id);
if (codec->name == NULL) { if (codec->name == NULL) {
kfree(codec); ret = -ENOMEM;
return -ENOMEM; goto fail_codec;
} }
if (codec_drv->compress_type) if (codec_drv->compress_type)
@ -4062,7 +4062,7 @@ int snd_soc_register_codec(struct device *dev,
reg_size, GFP_KERNEL); reg_size, GFP_KERNEL);
if (!codec->reg_def_copy) { if (!codec->reg_def_copy) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail_codec_name;
} }
} }
} }
@ -4096,8 +4096,9 @@ int snd_soc_register_codec(struct device *dev,
dev_dbg(codec->dev, "ASoC: Registered codec '%s'\n", codec->name); dev_dbg(codec->dev, "ASoC: Registered codec '%s'\n", codec->name);
return 0; return 0;
fail: fail_codec_name:
kfree(codec->name); kfree(codec->name);
fail_codec:
kfree(codec); kfree(codec);
return ret; return ret;
} }