diff options
author | Mark Brown <broonie@kernel.org> | 2019-12-25 18:51:43 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-12-25 18:51:43 +0100 |
commit | a82cf72f94af1135f2edde0a244499af390f333a (patch) | |
tree | ef49c313ce4450e836c4166035d8c276dd977e36 /sound/soc/fsl | |
parent | dt-bindings: sound: gtm601: add the broadmobi interface (diff) | |
parent | ASoC: SOF: imx8: Fix dsp_box offset (diff) | |
download | linux-a82cf72f94af1135f2edde0a244499af390f333a.tar.xz linux-a82cf72f94af1135f2edde0a244499af390f333a.zip |
Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.6
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/fsl_audmix.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c index a1db1bce330f..5faecbeb5497 100644 --- a/sound/soc/fsl/fsl_audmix.c +++ b/sound/soc/fsl/fsl_audmix.c @@ -505,15 +505,20 @@ static int fsl_audmix_probe(struct platform_device *pdev) ARRAY_SIZE(fsl_audmix_dai)); if (ret) { dev_err(dev, "failed to register ASoC DAI\n"); - return ret; + goto err_disable_pm; } priv->pdev = platform_device_register_data(dev, mdrv, 0, NULL, 0); if (IS_ERR(priv->pdev)) { ret = PTR_ERR(priv->pdev); dev_err(dev, "failed to register platform %s: %d\n", mdrv, ret); + goto err_disable_pm; } + return 0; + +err_disable_pm: + pm_runtime_disable(dev); return ret; } @@ -521,6 +526,8 @@ static int fsl_audmix_remove(struct platform_device *pdev) { struct fsl_audmix *priv = dev_get_drvdata(&pdev->dev); + pm_runtime_disable(&pdev->dev); + if (priv->pdev) platform_device_unregister(priv->pdev); |