diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /kernel/power/main.c | |
| parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
| parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 95bff23ecdaa..0b7476f5d2a6 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
| @@ -635,6 +635,13 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state) | |||
| 635 | } | 635 | } |
| 636 | if (status < 0) | 636 | if (status < 0) |
| 637 | printk(err_suspend, status); | 637 | printk(err_suspend, status); |
| 638 | |||
| 639 | /* Some platforms can't detect that the alarm triggered the | ||
| 640 | * wakeup, or (accordingly) disable it after it afterwards. | ||
| 641 | * It's supposed to give oneshot behavior; cope. | ||
| 642 | */ | ||
| 643 | alm.enabled = false; | ||
| 644 | rtc_set_alarm(rtc, &alm); | ||
| 638 | } | 645 | } |
| 639 | 646 | ||
| 640 | static int __init has_wakealarm(struct device *dev, void *name_ptr) | 647 | static int __init has_wakealarm(struct device *dev, void *name_ptr) |