diff options
| author | Robin Murphy <robin.murphy@arm.com> | 2019-10-02 16:30:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-10 11:27:16 +0100 |
| commit | d7e2a8e271aaeef572dc75b268c48fd4e6285ac1 (patch) | |
| tree | 16b4d765422283993d56e2709fce219f5a082986 /sound | |
| parent | 513474f59001d8d84b33b159d2b17ecc398ad356 (diff) | |
| download | linux-stable-d7e2a8e271aaeef572dc75b268c48fd4e6285ac1.tar.gz linux-stable-d7e2a8e271aaeef572dc75b268c48fd4e6285ac1.tar.bz2 linux-stable-d7e2a8e271aaeef572dc75b268c48fd4e6285ac1.zip | |
ASoc: rockchip: i2s: Fix RPM imbalance
[ 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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/rockchip/rockchip_i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 11399f81c92f..b86f76c3598c 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; |