ALSA: hda: cs35l56: Set the init_done flag before component_add()

Commit Message

Richard Fitzgerald March 25, 2024, 2:55 p.m. UTC

From: Simon Trimmer <[e-mail]>

Initialization is completed before adding the component as that can
start the process of the device binding and trigger actions that check
init_done.

Signed-off-by: Simon Trimmer <[e-mail]>
Signed-off-by: Richard Fitzgerald <[e-mail]>
Fixes: 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier")
---
 sound/pci/hda/cs35l56_hda.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Takashi Iwai March 25, 2024, 4:20 p.m. UTC | #1

On Mon, 25 Mar 2024 15:55:10 +0100,
Richard Fitzgerald wrote:
> 
> From: Simon Trimmer <[e-mail]>
> 
> Initialization is completed before adding the component as that can
> start the process of the device binding and trigger actions that check
> init_done.
> 
> Signed-off-by: Simon Trimmer <[e-mail]>
> Signed-off-by: Richard Fitzgerald <[e-mail]>
> Fixes: 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier")

Thanks, applied now.


Takashi

Patch

diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c
index f3c5715f5e02..1a3f84599cb5 100644
--- a/sound/pci/hda/cs35l56_hda.c
+++ b/sound/pci/hda/cs35l56_hda.c
@@ -1045,14 +1045,14 @@  int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)
 	pm_runtime_mark_last_busy(cs35l56->base.dev);
 	pm_runtime_enable(cs35l56->base.dev);
 
+	cs35l56->base.init_done = true;
+
 	ret = component_add(cs35l56->base.dev, &cs35l56_hda_comp_ops);
 	if (ret) {
 		dev_err(cs35l56->base.dev, "Register component failed: %d\n", ret);
 		goto pm_err;
 	}
 
-	cs35l56->base.init_done = true;
-
 	return 0;
 
 pm_err: