---

yaml --- r: 107669 b: refs/heads/master c: 140fab1 h: refs/heads/master i: 107667: 617a5a9 v: v3
git-mirror · Aug 5, 2008 · 89dbf22 · 89dbf22
1 parent 09b7808
commit 89dbf22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b128fe04a3087d6e974b87402dc6e75d3142186
+refs/heads/master: 140fab14aef093cedf87f69234474c04fdcec99c
diff --git a/trunk/drivers/rtc/rtc-bfin.c b/trunk/drivers/rtc/rtc-bfin.c
@@ -435,9 +435,10 @@ static int __devexit bfin_rtc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int bfin_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
-	if (device_may_wakeup(&pdev->dev))
+	if (device_may_wakeup(&pdev->dev)) {
 		enable_irq_wake(IRQ_RTC);
-	else
+		bfin_rtc_sync_pending(&pdev->dev);
+	} else
 		bfin_rtc_int_clear(-1);
 
 	return 0;