| From 8eb550d8c4317cbcc5ef8405d517e1363307b24e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 2 Oct 2019 16:30:37 +0100 |
| Subject: ASoc: rockchip: i2s: Fix RPM imbalance |
| |
| From: Robin Murphy <robin.murphy@arm.com> |
| |
| [ Upstream commit b1e620e7d32f5aad5353cc3cfc13ed99fea65d3a ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/rockchip/rockchip_i2s.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c |
| index 66fc13a2396a0..0e07e3dea7de4 100644 |
| --- a/sound/soc/rockchip/rockchip_i2s.c |
| +++ b/sound/soc/rockchip/rockchip_i2s.c |
| @@ -676,7 +676,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) |
| ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); |
| if (ret) { |
| dev_err(&pdev->dev, "Could not register PCM\n"); |
| - return ret; |
| + goto err_suspend; |
| } |
| |
| return 0; |
| -- |
| 2.20.1 |
| |
