---

yaml --- r: 343621 b: refs/heads/master c: 4964a26 h: refs/heads/master i: 343619: 776a1e6 v: v3
git-mirror · Oct 17, 2012 · 7b02841 · 7b02841
1 parent c013887
commit 7b02841
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);