aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMartin Povišer <povik+lin@cutebit.org>2022-09-27 13:34:26 +0200
committerMark Brown <broonie@kernel.org>2022-09-27 13:59:59 +0100
commitdb6ae79a7e4f729457ec42db5d6d0fbe0e35784c (patch)
tree96784a4102f913dbb497ae23afb2996283d59428 /sound/soc
parentASoC: apple: mca: Remove stale release of DMA channels (diff)
downloadlinux-dev-db6ae79a7e4f729457ec42db5d6d0fbe0e35784c.tar.xz
linux-dev-db6ae79a7e4f729457ec42db5d6d0fbe0e35784c.zip
ASoC: apple: mca: Adjust timing of component unregister
On removal of the driver, the ASoC component should be unregistered first, before we start releasing any of the other resources. Fixes: 3df5d0d97289 ("ASoC: apple: mca: Start new platform driver") Signed-off-by: Martin Povišer <povik+lin@cutebit.org> Link: https://lore.kernel.org/r/20220927113426.49724-3-povik+lin@cutebit.org Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/apple/mca.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/apple/mca.c b/sound/soc/apple/mca.c
index 7ca653987b78..24381c42eb54 100644
--- a/sound/soc/apple/mca.c
+++ b/sound/soc/apple/mca.c
@@ -1129,8 +1129,8 @@ static int apple_mca_probe(struct platform_device *pdev)
}
}
- ret = devm_snd_soc_register_component(&pdev->dev, &mca_component,
- dai_drivers, nclusters * 2);
+ ret = snd_soc_register_component(&pdev->dev, &mca_component,
+ dai_drivers, nclusters * 2);
if (ret) {
dev_err(&pdev->dev, "unable to register ASoC component: %d\n",
ret);
@@ -1148,6 +1148,7 @@ static int apple_mca_remove(struct platform_device *pdev)
{
struct mca_data *mca = platform_get_drvdata(pdev);
+ snd_soc_unregister_component(&pdev->dev);
apple_mca_release(mca);
return 0;
}