diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:34:00 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:34:00 +0200 |
| commit | 1e09939bad24df95ddeeeca4fbec64fa94b66def (patch) | |
| tree | 8a4661ed8c4619db28863353858e0171171b7d8a /arch/arm/plat-samsung/pm.c | |
| parent | Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel'... (diff) | |
| parent | ARM: S5P64X0: External Interrupt Support (diff) | |
| download | linux-1e09939bad24df95ddeeeca4fbec64fa94b66def.tar.xz linux-1e09939bad24df95ddeeeca4fbec64fa94b66def.zip | |
Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/devel
Diffstat (limited to 'arch/arm/plat-samsung/pm.c')
| -rw-r--r-- | arch/arm/plat-samsung/pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index 5c0a440d6e16..4f9a9515beae 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c @@ -268,6 +268,7 @@ static int s3c_pm_enter(suspend_state_t state) /* save all necessary core registers not covered by the drivers */ s3c_pm_save_gpios(); + s3c_pm_saved_gpios(); s3c_pm_save_uarts(); s3c_pm_save_core(); @@ -309,6 +310,7 @@ static int s3c_pm_enter(suspend_state_t state) s3c_pm_restore_core(); s3c_pm_restore_uarts(); s3c_pm_restore_gpios(); + s3c_pm_restored_gpios(); s3c_pm_debug_init(); |