ASoC: Intel: Skylake: fix possible memory leak in skl_codec_device_init()
If snd_hdac_device_register() fails, 'codec' and name allocated in dev_set_name() called in snd_hdac_device_init() are leaked. Fix this by calling put_device(), so they can be freed in snd_hda_codec_dev_release() and kobject_cleanup(). Fixes: e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines") Fixes: dfe66a18780d ("ALSA: hdac_ext: add extended HDA bus") Suggested-by: Cezary Rojewski <cezary.rojewski@intel.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20221021123849.456857-1-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
e9ec88a2a6
commit
0aa60ddc21
@ -680,11 +680,6 @@ static void load_codec_module(struct hda_codec *codec)
|
||||
|
||||
#endif /* CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC */
|
||||
|
||||
static void skl_codec_device_exit(struct device *dev)
|
||||
{
|
||||
snd_hdac_device_exit(dev_to_hdac_dev(dev));
|
||||
}
|
||||
|
||||
static struct hda_codec *skl_codec_device_init(struct hdac_bus *bus, int addr)
|
||||
{
|
||||
struct hda_codec *codec;
|
||||
@ -697,12 +692,11 @@ static struct hda_codec *skl_codec_device_init(struct hdac_bus *bus, int addr)
|
||||
}
|
||||
|
||||
codec->core.type = HDA_DEV_ASOC;
|
||||
codec->core.dev.release = skl_codec_device_exit;
|
||||
|
||||
ret = snd_hdac_device_register(&codec->core);
|
||||
if (ret) {
|
||||
dev_err(bus->dev, "failed to register hdac device\n");
|
||||
snd_hdac_device_exit(&codec->core);
|
||||
put_device(&codec->core.dev);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user