From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon, 10 Sep 2012 09:13:52 +0000 (-0700)
Subject: ASoC: fsi: fixup pm_runtime_disable() timing on fsi_probe()
X-Git-Tag: v3.7-rc2~30^2~1^2~117
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c35e005f3115cd27d85625805645b90ba961f16f;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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>
---

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 0540408..8534989 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;