From: Ulf Hansson Date: Wed, 17 Oct 2012 12:27:16 +0000 (+0200) Subject: spi/pl022: Activate resourses before deactivate them in suspend X-Git-Tag: next-20121018~27^2^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4964a26df72c4a82e56c6b40818648d54bde93cc;p=karo-tx-linux.git spi/pl022: Activate resourses before deactivate them in suspend To be able to deactivate resourses in suspend, the resourses must first be surely active. This is done with a pm_runtime_get_sync. Once the resourses are restored to active state again in resume, the runtime pm usage count can be decreased with a pm_runtime_put. Signed-off-by: Ulf Hansson Signed-off-by: Linus Walleij Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index a9106c936edb..c220c2346276 100644 --- a/drivers/spi/spi-pl022.c +++ b/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);