ASoC: hdac_hda: fix memleak with regmap not freed on remove
kmemleak throws error reports on module load/unload tests, add snd_hdac_regmap_exit() in .remove(). While we are at it, also fix the error handling flow in .probe() to use snd_hdac_regmap_exit() if needed. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Daniel Baluta <daniel.baluta@gmail.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Reviewed-by: Rander Wang <rander.wang@linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20200617164144.17859-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
ed1220df6e
Коммит
a94eaccefe
|
@ -441,13 +441,13 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
|
|||
ret = snd_hda_codec_set_name(hcodec, hcodec->preset->name);
|
||||
if (ret < 0) {
|
||||
dev_err(&hdev->dev, "name failed %s\n", hcodec->preset->name);
|
||||
goto error;
|
||||
goto error_pm;
|
||||
}
|
||||
|
||||
ret = snd_hdac_regmap_init(&hcodec->core);
|
||||
if (ret < 0) {
|
||||
dev_err(&hdev->dev, "regmap init failed\n");
|
||||
goto error;
|
||||
goto error_pm;
|
||||
}
|
||||
|
||||
patch = (hda_codec_patch_t)hcodec->preset->driver_data;
|
||||
|
@ -455,7 +455,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
|
|||
ret = patch(hcodec);
|
||||
if (ret < 0) {
|
||||
dev_err(&hdev->dev, "patch failed %d\n", ret);
|
||||
goto error;
|
||||
goto error_regmap;
|
||||
}
|
||||
} else {
|
||||
dev_dbg(&hdev->dev, "no patch file found\n");
|
||||
|
@ -467,7 +467,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
|
|||
ret = snd_hda_codec_parse_pcms(hcodec);
|
||||
if (ret < 0) {
|
||||
dev_err(&hdev->dev, "unable to map pcms to dai %d\n", ret);
|
||||
goto error;
|
||||
goto error_regmap;
|
||||
}
|
||||
|
||||
/* HDMI controls need to be created in machine drivers */
|
||||
|
@ -476,7 +476,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
|
|||
if (ret < 0) {
|
||||
dev_err(&hdev->dev, "unable to create controls %d\n",
|
||||
ret);
|
||||
goto error;
|
||||
goto error_regmap;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -496,7 +496,9 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
|
|||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
error_regmap:
|
||||
snd_hdac_regmap_exit(hdev);
|
||||
error_pm:
|
||||
pm_runtime_put(&hdev->dev);
|
||||
error_no_pm:
|
||||
snd_hdac_ext_bus_link_put(hdev->bus, hlink);
|
||||
|
@ -518,6 +520,8 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component)
|
|||
|
||||
pm_runtime_disable(&hdev->dev);
|
||||
snd_hdac_ext_bus_link_put(hdev->bus, hlink);
|
||||
|
||||
snd_hdac_regmap_exit(hdev);
|
||||
}
|
||||
|
||||
static const struct snd_soc_dapm_route hdac_hda_dapm_routes[] = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче