]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
ASoc: rockchip: i2s: Fix RPM imbalance
authorRobin Murphy <robin.murphy@arm.com>
Wed, 2 Oct 2019 15:30:37 +0000 (16:30 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 26 Nov 2019 12:15:55 +0000 (13:15 +0100)
commit06dc151dd0f67e3b38b1726f8eaf61b7381fd31b
tree9257084a63596f4a8bc3474a70955e76424cd662
parenta43c3117a02abd61fff250fdb3b29ac2fef00016
ASoc: rockchip: i2s: Fix RPM imbalance

BugLink: https://bugs.launchpad.net/bugs/1853208
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
sound/soc/rockchip/rockchip_i2s.c