From db70a71b8db5c24f6a21bd064c585d7d288cf7e0 Mon Sep 17 00:00:00 2001
From: Steven Miao <realmz6@gmail.com>
Date: Wed, 3 Nov 2010 09:25:09 +0000
Subject: [PATCH] --- yaml --- r: 228447 b: refs/heads/master c:
 36e11ab23e22243b9c608a08c8d68ca5686b6c9b h: refs/heads/master i:   228445:
 885e6b0dd6867470cf3e038dde4e3223b4cff355   228443:
 d770f730fc03fc20ce4301a919bf06ced6c953dc   228439:
 ff1dc3183585c89aa5872d7731d4d3577ed54dc6   228431:
 22e1c0055da5d0d473247e9c484722c43c7a0a3d   228415:
 4f86d0e12940b1fd19acdfac675744c747471093 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/blackfin/mach-common/pm.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 92bc1f9ad995..dc7ffd981d6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 527a1a83cc1ba4fc3e0f708cff062b834fbbcab9
+refs/heads/master: 36e11ab23e22243b9c608a08c8d68ca5686b6c9b
diff --git a/trunk/arch/blackfin/mach-common/pm.c b/trunk/arch/blackfin/mach-common/pm.c
index 80884b136a0c..42fa87e8375c 100644
--- a/trunk/arch/blackfin/mach-common/pm.c
+++ b/trunk/arch/blackfin/mach-common/pm.c
@@ -23,9 +23,6 @@
 
 void bfin_pm_suspend_standby_enter(void)
 {
-	unsigned long flags;
-
-	flags = hard_local_irq_save();
 	bfin_pm_standby_setup();
 
 #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER
@@ -55,8 +52,6 @@ void bfin_pm_suspend_standby_enter(void)
 #else
 	bfin_write_SIC_IWR(IWR_DISABLE_ALL);
 #endif
-
-	hard_local_irq_restore(flags);
 }
 
 int bf53x_suspend_l1_mem(unsigned char *memptr)
@@ -127,7 +122,6 @@ static void flushinv_all_dcache(void)
 
 int bfin_pm_suspend_mem_enter(void)
 {
-	unsigned long flags;
 	int wakeup, ret;
 
 	unsigned char *memptr = kmalloc(L1_CODE_LENGTH + L1_DATA_A_LENGTH
@@ -149,12 +143,9 @@ int bfin_pm_suspend_mem_enter(void)
 	wakeup |= GPWE;
 #endif
 
-	flags = hard_local_irq_save();
-
 	ret = blackfin_dma_suspend();
 
 	if (ret) {
-		hard_local_irq_restore(flags);
 		kfree(memptr);
 		return ret;
 	}
@@ -178,7 +169,6 @@ int bfin_pm_suspend_mem_enter(void)
 	bfin_gpio_pm_hibernate_restore();
 	blackfin_dma_resume();
 
-	hard_local_irq_restore(flags);
 	kfree(memptr);
 
 	return 0;