From c1055388b60fc980a49911d61622b2f9e7933a58 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 3 Oct 2012 11:56:54 +0200
Subject: [PATCH] --- yaml --- r: 343615 b: refs/heads/master c:
 965199573a9a50dae82ada92eb2b808b739ce949 h: refs/heads/master i:   343613:
 21284499ecdb889071ef6e5facd9c3a0f03f609f   343611:
 0f0decabf84b73a9df6837e6ec2beab72334337d   343607:
 b993a92c2464fb6199562921ad8ecb8b6708d17a   343599:
 3ff569e02a7728bb96eb2de9ad96f0231ff17c23   343583:
 882a261317be0f50e3bcfa9f4d02523352030955   343551:
 ce28f3ce3a368972ce0ed61f0cfc827ed3accc12 v: v3

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

diff --git a/[refs] b/[refs]
index e567e2ceff8d..1a5a6576639e 100644
--- 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
index af191f560136..c7b569567f12 100644
--- 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;
 }