Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: kirkwood: fix device remove ordering

The devm conversion of kirkwood was incorrect; on removal, devm takes
effect after the "remove" function has returned. So, the effect of
the conversion was to change the order during remove from:

- snd_soc_unregister_component() (unpublishes interfaces)
- clk_disable_unprepare()
- cleanup resources

After the conversion, this became:

- clk_disable_unprepare() - while the device may still be active
- snd_soc_unregister_component()
- cleanup resources

Hence, it introduces a bug, where the internal clock for the device
may be shut down before the device itself has been shut down. It is
known that Marvell SoCs, including Dove, locks up if registers for a
peripheral that has its clocks disabled are accessed.

Fixes: f98fc0f8154e ("ASoC: kirkwood: replace platform to component")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1iNGyP-0004oN-BA@rmk-PC.armlinux.org.uk
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Russell King and committed by
Mark Brown
dc39596a d10be65f

+2 -1
+2 -1
sound/soc/kirkwood/kirkwood-i2s.c
··· 587 587 priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_128; 588 588 } 589 589 590 - err = devm_snd_soc_register_component(&pdev->dev, &kirkwood_soc_component, 590 + err = snd_soc_register_component(&pdev->dev, &kirkwood_soc_component, 591 591 soc_dai, 2); 592 592 if (err) { 593 593 dev_err(&pdev->dev, "snd_soc_register_component failed\n"); ··· 610 610 { 611 611 struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev); 612 612 613 + snd_soc_unregister_component(&pdev->dev); 613 614 if (!IS_ERR(priv->extclk)) 614 615 clk_disable_unprepare(priv->extclk); 615 616 clk_disable_unprepare(priv->clk);