Merge branch 'next' into for-linus

Prepare input updates for 5.2 merge window.
2019-05-10 11:40:35 -07:00
parent 3a349763cf 0981949da8
commit 14e0c7317e
30 changed files with 2297 additions and 74 deletions
--- 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;