summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/fsi.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-09-10 11:13:52 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-10 11:27:04 +0200
commitc35e005f3115cd27d85625805645b90ba961f16f (patch)
tree74d4e70734fe33e76ec3fdecb3d214a3fe638eed /sound/soc/sh/fsi.c
parentASoC: sta32x: Convert to regmap (diff)
downloadlinux-c35e005f3115cd27d85625805645b90ba961f16f.tar.xz
linux-c35e005f3115cd27d85625805645b90ba961f16f.zip
ASoC: fsi: fixup pm_runtime_disable() timing on fsi_probe()
pm_runtime_disable() error handling timing on fsi_probe() was wrong. This patch fixes it up. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/sh/fsi.c')
-rw-r--r--sound/soc/sh/fsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 0540408a9fa9..8534989836aa 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1730,12 +1730,12 @@ exit_snd_soc:
exit_free_irq:
free_irq(irq, master);
exit_fsib:
+ pm_runtime_disable(&pdev->dev);
fsi_stream_remove(&master->fsib);
exit_fsia:
fsi_stream_remove(&master->fsia);
exit_iounmap:
iounmap(master->base);
- pm_runtime_disable(&pdev->dev);
exit_kfree:
kfree(master);
master = NULL;