summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorSimon Trimmer <simont@opensource.cirrus.com>2024-03-25 14:55:10 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-10 16:35:41 +0200
commit0172edc572b052192eb89ebfb93191f8bb5bf1bf (patch)
tree7ad8ec150e2d4ef2b08c29c75c60005401e9d802 /sound/pci
parentdc1ec9c5efec2df1f249c53cde937d2b938b61fa (diff)
downloadlinux-0172edc572b052192eb89ebfb93191f8bb5bf1bf.tar.gz
linux-0172edc572b052192eb89ebfb93191f8bb5bf1bf.tar.bz2
linux-0172edc572b052192eb89ebfb93191f8bb5bf1bf.zip
ALSA: hda: cs35l56: Set the init_done flag before component_add()
[ Upstream commit cafe9c6a72cf1ffe96d2561d988a141cb5c093db ] 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 <simont@opensource.cirrus.com> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Fixes: 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier") Message-ID: <20240325145510.328378-1-rf@opensource.cirrus.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/cs35l56_hda.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c
index 7adc1d373d65..27848d646963 100644
--- a/sound/pci/hda/cs35l56_hda.c
+++ b/sound/pci/hda/cs35l56_hda.c
@@ -978,14 +978,14 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, 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: