aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci
diff options
context:
space:
mode:
authorAnil Kumar <anilk4.v@gmail.com>2014-11-09 18:15:14 +0530
committerMark Brown <broonie@kernel.org>2014-11-10 13:45:38 +0000
commit7771ef3286711a121b763c3620c4619f51b2acfd (patch)
treecb767af22d2a36c01a632a6b12b60031f2478cbb /sound/soc/davinci
parentASoC: davinci-mcasp: When stopping TX/RX stop the AFIFO as the last step (diff)
downloadlinux-dev-7771ef3286711a121b763c3620c4619f51b2acfd.tar.xz
linux-dev-7771ef3286711a121b763c3620c4619f51b2acfd.zip
ASoC: davinvi-mcasp: Balance pm_runtime_enable() on probe failure
If probe fails then we need to call pm_runtime_disable() to balance out the previous pm_runtime_enable() call. Signed-off-by: Anil Kumar <anilk4.v@gmail.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r--sound/soc/davinci/davinci-mcasp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 002351f9fc40..57f606e4cf02 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1225,6 +1225,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
ret = pm_runtime_get_sync(&pdev->dev);
if (IS_ERR_VALUE(ret)) {
dev_err(&pdev->dev, "pm_runtime_get_sync() failed\n");
+ pm_runtime_disable(&pdev->dev);
return ret;
}