aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-03 05:56:54 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-17 03:13:25 -0400
commit965199573a9a50dae82ada92eb2b808b739ce949 (patch)
tree153fb61457850cfaee67611ec53f96a2a8958086 /drivers/spi
parent61d15963176d44ba898913389b65588e717b7c59 (diff)
spi/bcm63xx: add missing spi_master_{resume,suspend} calls to PM callbacks
The PM callbacks implemented by the spi-bcm63xx driver don't call spi_master_{resume,suspend}, fix that. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-bcm63xx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index af191f560136..c7b569567f12 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -484,6 +484,8 @@ static int bcm63xx_spi_suspend(struct device *dev)
484 platform_get_drvdata(to_platform_device(dev)); 484 platform_get_drvdata(to_platform_device(dev));
485 struct bcm63xx_spi *bs = spi_master_get_devdata(master); 485 struct bcm63xx_spi *bs = spi_master_get_devdata(master);
486 486
487 spi_master_suspend(master);
488
487 clk_disable(bs->clk); 489 clk_disable(bs->clk);
488 490
489 return 0; 491 return 0;
@@ -497,6 +499,8 @@ static int bcm63xx_spi_resume(struct device *dev)
497 499
498 clk_enable(bs->clk); 500 clk_enable(bs->clk);
499 501
502 spi_master_resume(master);
503
500 return 0; 504 return 0;
501} 505}
502 506