diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-12-10 19:00:53 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2009-12-11 02:56:24 +0100 |
| commit | f25c525c1412675d2b23d5d88660fb5c9f3a5341 (patch) | |
| tree | 9f5b5ec76a0dfbb590bda9dc182f30919f31be26 | |
| parent | powerpc/cpm2_pic: Allow correct flow_types for port C interrupts (diff) | |
| download | linux-f25c525c1412675d2b23d5d88660fb5c9f3a5341.tar.xz linux-f25c525c1412675d2b23d5d88660fb5c9f3a5341.zip | |
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>
| -rw-r--r-- | arch/powerpc/platforms/83xx/suspend.c | 4 |
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: return ret; } -static void mpc83xx_suspend_finish(void) +static void mpc83xx_suspend_end(void) { deep_sleeping = 0; } @@ -278,7 +278,7 @@ static struct platform_suspend_ops mpc83xx_suspend_ops = { .valid = mpc83xx_suspend_valid, .begin = mpc83xx_suspend_begin, .enter = mpc83xx_suspend_enter, - .finish = mpc83xx_suspend_finish, + .end = mpc83xx_suspend_end, }; static int pmc_probe(struct of_device *ofdev, |