From 89dbf22137c8d32729caf3b4aed9c58b6729bf68 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 5 Aug 2008 13:01:20 -0700 Subject: [PATCH] --- yaml --- r: 107669 b: refs/heads/master c: 140fab14aef093cedf87f69234474c04fdcec99c h: refs/heads/master i: 107667: 617a5a9cb2e563a499cf6715cae91af75dbd56d1 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-bfin.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9abe2b3bf12c..83cfa7230e99 100644 --- 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 index d53772f59ce5..e6b0470063e8 100644 --- 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;