From 89dee3822815bdd6605ab596fcab157bb2fe8dd9 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Wed, 6 Feb 2008 01:38:57 -0800
Subject: [PATCH] --- yaml --- r: 83545 b: refs/heads/master c:
 f618258ad8af0413f08af60bd0eb050562e700fa h: refs/heads/master i:   83543:
 0e613ddc66e9dfe461cb7860134dc4bcd1dfecf1 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/rtc/rtc-sa1100.c | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 754a4596566d..82727a587762 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8696e70267a6b1c7f1e26b32ce97646334b1613a
+refs/heads/master: f618258ad8af0413f08af60bd0eb050562e700fa
diff --git a/trunk/drivers/rtc/rtc-sa1100.c b/trunk/drivers/rtc/rtc-sa1100.c
index 2eb38520f0c8..ee253cc45de1 100644
--- a/trunk/drivers/rtc/rtc-sa1100.c
+++ b/trunk/drivers/rtc/rtc-sa1100.c
@@ -357,23 +357,15 @@ static int sa1100_rtc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int sa1100_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
-	if (pdev->dev.power.power_state.event != state.event) {
-		if (state.event == PM_EVENT_SUSPEND &&
-		    device_may_wakeup(&pdev->dev))
-			enable_irq_wake(IRQ_RTCAlrm);
-
-		pdev->dev.power.power_state = state;
-	}
+	if (device_may_wakeup(&pdev->dev))
+		enable_irq_wake(IRQ_RTCAlrm);
 	return 0;
 }
 
 static int sa1100_rtc_resume(struct platform_device *pdev)
 {
-	if (pdev->dev.power.power_state.event != PM_EVENT_ON) {
-		if (device_may_wakeup(&pdev->dev))
-			disable_irq_wake(IRQ_RTCAlrm);
-		pdev->dev.power.power_state = PMSG_ON;
-	}
+	if (device_may_wakeup(&pdev->dev))
+		disable_irq_wake(IRQ_RTCAlrm);
 	return 0;
 }
 #else