aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2009-12-10 13:00:53 -0500
committerKumar Gala <galak@kernel.crashing.org>2009-12-10 20:56:24 -0500
commitf25c525c1412675d2b23d5d88660fb5c9f3a5341 (patch)
tree9f5b5ec76a0dfbb590bda9dc182f30919f31be26 /arch
parentb22b97c15eed893a6768aad2f596706c56bf194e (diff)
powerpc/83xx/suspend: Clear deep_sleeping after devices resume
Currently 83xx PMC driver clears deep_sleeping variable very early, before devices are resumed. This makes fsl_deep_sleep() unusable in drivers' resume() callback. Sure, drivers can store fsl_deep_sleep() value on suspend and use the stored value on resume. But a better solution is to postpone clearing the deep_sleeping variable, i.e. move it into finish() callback. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/83xx/suspend.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index d306f07b9aa1..b0c261936f3d 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -194,7 +194,7 @@ out:
194 return ret; 194 return ret;
195} 195}
196 196
197static void mpc83xx_suspend_finish(void) 197static void mpc83xx_suspend_end(void)
198{ 198{
199 deep_sleeping = 0; 199 deep_sleeping = 0;
200} 200}
@@ -278,7 +278,7 @@ static struct platform_suspend_ops mpc83xx_suspend_ops = {
278 .valid = mpc83xx_suspend_valid, 278 .valid = mpc83xx_suspend_valid,
279 .begin = mpc83xx_suspend_begin, 279 .begin = mpc83xx_suspend_begin,
280 .enter = mpc83xx_suspend_enter, 280 .enter = mpc83xx_suspend_enter,
281 .finish = mpc83xx_suspend_finish, 281 .end = mpc83xx_suspend_end,
282}; 282};
283 283
284static int pmc_probe(struct of_device *ofdev, 284static int pmc_probe(struct of_device *ofdev,