diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-10 20:40:35 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-10 20:40:35 +0200 |
| commit | 14e0c7317ed58bcd15af5c3d09818ee0f2e3984c (patch) | |
| tree | f9b63dc681574484c23c6b01be81f17cf9c64d6a /drivers/input/mouse | |
| parent | Input: synaptics-rmi4 - write config register values to the right offset (diff) | |
| parent | Input: libps2 - mark expected switch fall-through (diff) | |
| download | linux-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.tar.xz linux-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.2 merge window.
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index d3ff1fc09af7..94f7ca5ad077 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -373,6 +373,8 @@ static irqreturn_t psmouse_interrupt(struct serio *serio, if (ps2_handle_response(&psmouse->ps2dev, data)) goto out; + pm_wakeup_event(&serio->dev, 0); + if (psmouse->state <= PSMOUSE_RESYNCING) goto out; |