---

yaml --- r: 343615 b: refs/heads/master c: 9651995 h: refs/heads/master i: 343613: 2128449 343611: 0f0deca 343607: b993a92 343599: 3ff569e 343583: 882a261 343551: ce28f3c v: v3
git-mirror · Oct 17, 2012 · c105538 · c105538
1 parent 858a21f
commit c105538
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61d15963176d44ba898913389b65588e717b7c59
+refs/heads/master: 965199573a9a50dae82ada92eb2b808b739ce949
diff --git a/trunk/drivers/spi/spi-bcm63xx.c b/trunk/drivers/spi/spi-bcm63xx.c
@@ -484,6 +484,8 @@ static int bcm63xx_spi_suspend(struct device *dev)
 			platform_get_drvdata(to_platform_device(dev));
 	struct bcm63xx_spi *bs = spi_master_get_devdata(master);
 
+	spi_master_suspend(master);
+
 	clk_disable(bs->clk);
 
 	return 0;
@@ -497,6 +499,8 @@ static int bcm63xx_spi_resume(struct device *dev)
 
 	clk_enable(bs->clk);
 
+	spi_master_resume(master);
+
 	return 0;
 }