ALSA: hda: cs35l41: Component should be unbound before deconstruction

[ Upstream commit 6f9a40d61cad0f5560e8530b4dd4a05fc4d15987 ]

The interface associated with the hda_component should be deactivated
before the driver is deconstructed during removal.

Fixes: 7b2f3eb492da ("ALSA: hda: cs35l41: Add support for CS35L41 in HDA systems")
Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240613133713.75550-3-simont@opensource.cirrus.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 25cf072a2a10bab8386dbc98b896205684f2f1a7..ec688c60c153bd320c566157cc99bc154dce0ca4 100644 (file)
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -1857,6 +1857,8 @@ void cs35l41_hda_remove(struct device *dev)
 {
        struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
 
+       component_del(cs35l41->dev, &cs35l41_hda_comp_ops);
+
        pm_runtime_get_sync(cs35l41->dev);
        pm_runtime_dont_use_autosuspend(cs35l41->dev);
        pm_runtime_disable(cs35l41->dev);
@@ -1864,8 +1866,6 @@ void cs35l41_hda_remove(struct device *dev)
        if (cs35l41->halo_initialized)
                cs35l41_remove_dsp(cs35l41);
 
-       component_del(cs35l41->dev, &cs35l41_hda_comp_ops);
-
        acpi_dev_put(cs35l41->dacpi);
 
        pm_runtime_put_noidle(cs35l41->dev);