diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-09 04:02:01 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-09 04:02:01 (GMT) |
| commit | 3871608e4cb995b0fb9c630da9ac45b246151fef (patch) | |
| tree | 1a7d65ae9b815e73ec9ffe00d6a3778ab66d5dc8 /drivers/base | |
| parent | d177d7df2673ea81e8ee1e3d468398eeb7e580f5 (diff) | |
| parent | 5caae9d1419914177994363218616b869659e871 (diff) | |
| download | linux-3871608e4cb995b0fb9c630da9ac45b246151fef.tar.xz | |
Merge tag 'v4.9.61' into linux-linaro-lsk-v4.9
This is the 4.9.61 stable release
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/wakeirq.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c index 404d94c..feba1b2 100644 --- a/drivers/base/power/wakeirq.c +++ b/drivers/base/power/wakeirq.c @@ -141,6 +141,13 @@ static irqreturn_t handle_threaded_wake_irq(int irq, void *_wirq) struct wake_irq *wirq = _wirq; int res; + /* Maybe abort suspend? */ + if (irqd_is_wakeup_set(irq_get_irq_data(irq))) { + pm_wakeup_event(wirq->dev, 0); + + return IRQ_HANDLED; + } + /* We don't want RPM_ASYNC or RPM_NOWAIT here */ res = pm_runtime_resume(wirq->dev); if (res < 0) |