ALSA: hda: cs35l56: Fix lifetime of cs_dsp instance
PATCH 1/1 ALSA: hda: cs35l56: Fix lifetime of cs_dsp instance
The cs_dsp instance is initialized in the driver probe() so it should be freed in the driver remove(). Also fix a missing call to cs_dsp_remove() in the error path of cs35l56_hda_common_probe().
The call to cs_dsp_remove() was being done in the component unbind callback cs35l56_hda_unbind(). This meant that if the driver was unbound and then re-bound it would be using an uninitialized cs_dsp instance.
It is best to initialize the cs_dsp instance in probe() so that it can return an error if it fails. The component binding API doesn't have any error handling so there's no way to handle a failure if cs_dsp was initialized in the bind.
--- sound/pci/hda/cs35l56_hda.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/pci/hda/cs35l56_hda.c +5 -3
@@ -732,8 +732,6 @@ static void cs35l56_hda_unbind(struct device *dev, struct device *master, void *if (cs35l56->base.fw_patched)cs_dsp_power_down (&cs35l56->cs_dsp); -cs_dsp_remove (&cs35l56->cs_dsp); -if (comps[cs35l56->index].dev == dev)memset (&comps[cs35l56->index],0 ,sizeof (*comps));
@@ -1035,7 +1033,7 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id) ARRAY_SIZE(cs35l56_hda_dai_config)); ret =cs35l56_force_sync_asp1_registers_from_cache (&cs35l56->base);if (ret) - goto err; + goto dsp_err;/* * By default only enable one ASP1TXn, where n=amplifier index,
@@ -1061,6 +1059,8 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id) pm_err:pm_runtime_disable (cs35l56->base.dev); +dsp_err: +cs_dsp_remove (&cs35l56->cs_dsp); err:gpiod_set_value_cansleep (cs35l56->base.reset_gpio,0 );
@@ -1078,6 +1078,8 @@ void cs35l56_hda_remove(struct device *dev)component_del (cs35l56->base.dev, &cs35l56_hda_comp_ops); +cs_dsp_remove (&cs35l56->cs_dsp); +kfree (cs35l56->system_name);pm_runtime_put_noidle (cs35l56->base.dev);
Signature · 1 line
2.39.2
Quoted 10 lines · Richard Fitzgerald
The
cs_dspinstance is initialized in the driverprobe()so it should be freed in the driverremove(). Also fix a missing call tocs_dsp_remove()in the error path ofcs35l56_hda_common_probe().The call to
cs_dsp_remove()was being done in the component unbind callbackcs35l56_hda_unbind(). This meant that if the driver was unbound and then re-bound it would be using an uninitializedcs_dspinstance.
Quoted 7 lines
It is best to initialize the
cs_dspinstance inprobe()so that it can return an error if it fails. The component binding API doesn't have any error handling so there's no way to handle a failure ifcs_dspwas initialized in the bind.Signed-off-by Richard Fitzgerald <[email protected]>Fixes 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier")
Applied now. Thanks.
Takashi