diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2011-01-25 16:04:00 -0500 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-02-09 10:05:03 -0500 |
| commit | 3d9cb0eafd024d6fc1b1583ff9b17e5f60951fd9 (patch) | |
| tree | 54bd0d074df77b0783623e9f705d5285f5e5b4bb | |
| parent | 57834a722473848338b1967f7fdd9907c713b0a7 (diff) | |
ARM: pxa: only save/restore registers when pm functions are defined
Reported-and-tested-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| -rw-r--r-- | arch/arm/mach-pxa/pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 978e1b289544..1807c9abdde0 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
| @@ -33,7 +33,7 @@ int pxa_pm_enter(suspend_state_t state) | |||
| 33 | #endif | 33 | #endif |
| 34 | 34 | ||
| 35 | /* skip registers saving for standby */ | 35 | /* skip registers saving for standby */ |
| 36 | if (state != PM_SUSPEND_STANDBY) { | 36 | if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->save) { |
| 37 | pxa_cpu_pm_fns->save(sleep_save); | 37 | pxa_cpu_pm_fns->save(sleep_save); |
| 38 | /* before sleeping, calculate and save a checksum */ | 38 | /* before sleeping, calculate and save a checksum */ |
| 39 | for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++) | 39 | for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++) |
| @@ -44,7 +44,7 @@ int pxa_pm_enter(suspend_state_t state) | |||
| 44 | pxa_cpu_pm_fns->enter(state); | 44 | pxa_cpu_pm_fns->enter(state); |
| 45 | cpu_init(); | 45 | cpu_init(); |
| 46 | 46 | ||
| 47 | if (state != PM_SUSPEND_STANDBY) { | 47 | if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->restore) { |
| 48 | /* after sleeping, validate the checksum */ | 48 | /* after sleeping, validate the checksum */ |
| 49 | for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++) | 49 | for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++) |
| 50 | checksum += sleep_save[i]; | 50 | checksum += sleep_save[i]; |
