From 7b028412160f5f368eee398a69f227e61c9b467a Mon Sep 17 00:00:00 2001
From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Wed, 17 Oct 2012 14:27:16 +0200
Subject: [PATCH] --- yaml --- r: 343621 b: refs/heads/master c:
 4964a26df72c4a82e56c6b40818648d54bde93cc h: refs/heads/master i:   343619:
 776a1e67f7eb924e180335815bf54cc9cfa23576 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/spi/spi-pl022.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4eb8cab6fab8..a74c8e655843 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0df349945752bf04cee52babf266bbf1f4812193
+refs/heads/master: 4964a26df72c4a82e56c6b40818648d54bde93cc
diff --git a/trunk/drivers/spi/spi-pl022.c b/trunk/drivers/spi/spi-pl022.c
index a9106c936edb..c220c2346276 100644
--- a/trunk/drivers/spi/spi-pl022.c
+++ b/trunk/drivers/spi/spi-pl022.c
@@ -2349,6 +2349,8 @@ static int pl022_suspend(struct device *dev)
 		dev_warn(dev, "cannot suspend master\n");
 		return ret;
 	}
+
+	pm_runtime_get_sync(dev);
 	pl022_suspend_resources(pl022);
 
 	dev_dbg(dev, "suspended\n");
@@ -2361,6 +2363,7 @@ static int pl022_resume(struct device *dev)
 	int ret;
 
 	pl022_resume_resources(pl022);
+	pm_runtime_put(dev);
 
 	/* Start the queue running */
 	ret = spi_master_resume(pl022->master);