summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRobin Murphy <robin.murphy@arm.com>2019-10-02 16:30:37 +0100
committerMark Brown <broonie@kernel.org>2019-10-03 14:32:13 +0100
commitb1e620e7d32f5aad5353cc3cfc13ed99fea65d3a (patch)
tree04419b7ae4e1dc13e4665de58fd61aef9b904663 /sound
parent3ae7359c0e39f42a96284d6798fc669acff38140 (diff)
downloadlinux-b1e620e7d32f5aad5353cc3cfc13ed99fea65d3a.tar.gz
linux-b1e620e7d32f5aad5353cc3cfc13ed99fea65d3a.tar.bz2
linux-b1e620e7d32f5aad5353cc3cfc13ed99fea65d3a.zip
ASoc: rockchip: i2s: Fix RPM imbalance
If rockchip_pcm_platform_register() fails, e.g. upon deferring to wait for an absent DMA channel, we return without disabling RPM, which makes subsequent re-probe attempts scream with errors about the unbalanced enable. Don't do that. Fixes: ebb75c0bdba2 ("ASoC: rockchip: i2s: Adjust devm usage") Signed-off-by: Robin Murphy <robin.murphy@arm.com> Link: https://lore.kernel.org/r/bcb12a849a05437fb18372bc7536c649b94bdf07.1570029862.git.robin.murphy@arm.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/rockchip/rockchip_i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index af2d5a6124c8..61c984f10d8e 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -677,7 +677,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
ret = rockchip_pcm_platform_register(&pdev->dev);
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
- return ret;
+ goto err_suspend;
}
return 0;