From a955c010d2440cdf70ce68aac105f9fa746f91d5 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon, 10 Sep 2012 02:13:52 -0700
Subject: [PATCH] --- yaml --- r: 332068 b: refs/heads/master c:
 c35e005f3115cd27d85625805645b90ba961f16f h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/sound/soc/sh/fsi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 426c00e35200..e6209b97a585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29fdf4fbbe0891349d8444bde4c09f9cfaf744b6
+refs/heads/master: c35e005f3115cd27d85625805645b90ba961f16f
diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c
index 0540408a9fa9..8534989836aa 100644
--- a/trunk/sound/soc/sh/fsi.c
+++ b/trunk/sound/soc/sh/fsi.c
@@ -1730,12 +1730,12 @@ static int fsi_probe(struct platform_device *pdev)
 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;