diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-23 05:32:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-23 05:32:48 +0200 |
| commit | 218b6a5b23e939caf2064549b1cb61ba22b9d0a1 (patch) | |
| tree | bdabf5439fb58905268953165779614d2aadb677 /drivers/rtc/rtc-cmos.c | |
| parent | Merge branch 'dsa-distribute-switch-events' (diff) | |
| parent | Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.tar.xz linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/rtc/rtc-cmos.c')
| -rw-r--r-- | drivers/rtc/rtc-cmos.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index b3de973a6260..9dca53df3584 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -1088,7 +1088,7 @@ static u32 rtc_handler(void *context) } spin_unlock_irqrestore(&rtc_lock, flags); - pm_wakeup_event(dev, 0); + pm_wakeup_hard_event(dev); acpi_clear_event(ACPI_EVENT_RTC); acpi_disable_event(ACPI_EVENT_RTC, 0); return ACPI_INTERRUPT_HANDLED; |