Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (176 commits)
  [ARM] 4795/1: S3C244X: Add armclk and setparent call
  [ARM] 4794/1: S3C24XX: Comonise S3C2440 and S3C2442 clock code
  [ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function
  [ARM] 4792/1: S3C24XX: Remove warnings from debug-macro.S
  [ARM] 4791/1: S3C2412: Make fclk a parent of msysclk
  [ARM] 4790/1: S3C2412: Fix parent selection for msysclk.
  [ARM] 4789/1: S3C2412: Add missing CLKDIVN register values
  [ARM] 4788/1: S3C24XX: Fix paramet to s3c2410_dma_ctrl if S3C2410_DMAF_AUTOSTART used.
  [ARM] 4787/1: S3C24XX: s3c2410_dma_request() should return the allocated channel number
  [ARM] 4786/1: S3C2412: Add SPI FIFO controll constants
  [ARM] 4785/1: S3C24XX: Add _SHIFT definitions for S3C2410_BANKCON registers
  [ARM] 4784/1: S3C24XX: Fix GPIO restore glitches
  [ARM] 4783/1: S3C24XX: Add s3c2410_gpio_getpull()
  [ARM] 4782/1: S3C24XX: Define FIQ_START for any FIQ users
  [ARM] 4781/1: S3C24XX: DMA suspend and resume support
  [ARM] 4780/1: S3C2412: Allow for seperate DMA channels for TX and RX
  [ARM] 4779/1: S3C2412: Add s3c2412_gpio_set_sleepcfg() call
  [ARM] 4778/1: S3C2412: Add armclk and init from DVS state
  [ARM] 4777/1: S3C24XX: Ensure clk_set_rate() checks the set_rate method for the clk
  [ARM] 4775/1: s3c2410: fix compilation error if only s3c2442 cpu is selected
  ...

1 files changed, 18 insertions, 15 deletions

diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index a941c71c7d06..039194cbe477 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -38,34 +38,37 @@ int pxa_pm_enter(suspend_state_t state)
                 iwmmxt_task_disable(NULL);
 #endif
 
-        pxa_cpu_pm_fns->save(sleep_save);
+        /* skip registers saving for standby */
+        if (state != PM_SUSPEND_STANDBY) {
+                pxa_cpu_pm_fns->save(sleep_save);
+                /* before sleeping, calculate and save a checksum */
+                for (i = 0; i < pxa_cpu_pm_fns->save_size - 1; i++)
+                        sleep_save_checksum += sleep_save[i];
+        }
 
         /* Clear sleep reset status */
         RCSR = RCSR_SMR;
 
-        /* before sleeping, calculate and save a checksum */
-        for (i = 0; i < pxa_cpu_pm_fns->save_size - 1; i++)
-                sleep_save_checksum += sleep_save[i];
-
         /* *** go zzz *** */
         pxa_cpu_pm_fns->enter(state);
         cpu_init();
 
-        /* after sleeping, validate the checksum */
-        for (i = 0; i < pxa_cpu_pm_fns->save_size - 1; i++)
-                checksum += sleep_save[i];
+        if (state != PM_SUSPEND_STANDBY) {
+                /* after sleeping, validate the checksum */
+                for (i = 0; i < pxa_cpu_pm_fns->save_size - 1; i++)
+                        checksum += sleep_save[i];
 
-        /* if invalid, display message and wait for a hardware reset */
-        if (checksum != sleep_save_checksum) {
+                /* if invalid, display message and wait for a hardware reset */
+                if (checksum != sleep_save_checksum) {
 #ifdef CONFIG_ARCH_LUBBOCK
-                LUB_HEXLED = 0xbadbadc5;
+                        LUB_HEXLED = 0xbadbadc5;
 #endif
-                while (1)
-                        pxa_cpu_pm_fns->enter(state);
+                        while (1)
+                                pxa_cpu_pm_fns->enter(state);
+                }
+                pxa_cpu_pm_fns->restore(sleep_save);
         }
 
-        pxa_cpu_pm_fns->restore(sleep_save);
-
         pr_debug("*** made it back from resume\n");
 
         return 0;