diff options
author | Takashi Iwai <tiwai@suse.de> | 2020-06-22 13:49:14 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-06-22 13:49:14 +0200 |
commit | 91ef3d9f9fef08e3f42b78ec0ae8187be1070fce (patch) | |
tree | 3bcf664e2d42a7f22d905d739dd24ab0df40f706 /sound/soc/rockchip/rockchip_pdm.c | |
parent | ALSA: hda: Intel: add missing PCI IDs for ICL-H, TGL-H and EKL (diff) | |
parent | ASoC: rockchip: Fix a reference count leak. (diff) | |
download | linux-91ef3d9f9fef08e3f42b78ec0ae8187be1070fce.tar.xz linux-91ef3d9f9fef08e3f42b78ec0ae8187be1070fce.zip |
Merge tag 'asoc-fix-v5.8-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.8
This is a collection of mostly small fixes, mostly fixing fallout from
some of the DPCM changes that went in last time around which shook out
some issues on i.MX and Qualcomm platforms. The addition of a managed
version of snd_soc_register_dai() is to fix resource leaks.
There's also a few new device IDs for x86 systems.
Diffstat (limited to 'sound/soc/rockchip/rockchip_pdm.c')
-rw-r--r-- | sound/soc/rockchip/rockchip_pdm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 7cd42fcfcf38..1707414cfa92 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -590,8 +590,10 @@ static int rockchip_pdm_resume(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } ret = regcache_sync(pdm->regmap); |