From c8463c89a057878531781ca3f767fa358e174ca0 Mon Sep 17 00:00:00 2001 From: Paul Fox Date: Mon, 16 Jul 2012 21:56:26 +0200 Subject: [PATCH] --- yaml --- r: 312772 b: refs/heads/master c: b45bae36b805287c76366c908de58b5c2c0d46b0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-cmos.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6307d2161533..1d77f5e31dcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f31f5b19eb0418a847b989abc9ac22af1991fe2 +refs/heads/master: b45bae36b805287c76366c908de58b5c2c0d46b0 diff --git a/trunk/drivers/rtc/rtc-cmos.c b/trunk/drivers/rtc/rtc-cmos.c index 4267789ca995..132333d75408 100644 --- a/trunk/drivers/rtc/rtc-cmos.c +++ b/trunk/drivers/rtc/rtc-cmos.c @@ -568,6 +568,7 @@ static irqreturn_t cmos_interrupt(int irq, void *p) hpet_mask_rtc_irq_bit(RTC_AIE); CMOS_READ(RTC_INTR_FLAGS); + pm_wakeup_event(cmos_rtc.dev, 0); } spin_unlock(&rtc_lock);