OSDN Git Service

ASoc: rockchip: i2s: Fix RPM imbalance
authorRobin Murphy <robin.murphy@arm.com>
Wed, 2 Oct 2019 15:30:37 +0000 (16:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 10 Nov 2019 10:21:06 +0000 (11:21 +0100)
commit04f85d1992c03de5e2deddf2a0fbfadf4eee2eb1
tree681c832651600130431cf1dfd0a3b572d65a8fbf
parent43de4298fb869a5a165b53a52f8e5496bce9aa3b
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>
sound/soc/rockchip/rockchip_i2s.c