diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-11-24 17:05:27 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-11-24 17:05:27 -0800 |
| commit | 0201710ba6308a61f1a775c418fe74b8a31ace08 (patch) | |
| tree | 4ba8de26ade82869bce1014f1ab19207ec070548 /drivers/input/mouse/alps.c | |
| parent | 5c822c0ce5cc83ed4cd8394f3dc46dae8d9a681d (diff) | |
| parent | 04337738629e8020c272c0dfcd56b9ae0a55ce98 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.13 merge window.
Diffstat (limited to 'drivers/input/mouse/alps.c')
| -rw-r--r-- | drivers/input/mouse/alps.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 4e37fc3f1a9e..0728b5c08f02 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1585,7 +1585,7 @@ static void alps_flush_packet(struct timer_list *t) struct alps_data *priv = from_timer(priv, t, timer); struct psmouse *psmouse = priv->psmouse; - serio_pause_rx(psmouse->ps2dev.serio); + guard(serio_pause_rx)(psmouse->ps2dev.serio); if (psmouse->pktcnt == psmouse->pktsize) { @@ -1605,8 +1605,6 @@ static void alps_flush_packet(struct timer_list *t) } psmouse->pktcnt = 0; } - - serio_continue_rx(psmouse->ps2dev.serio); } static psmouse_ret_t alps_process_byte(struct psmouse *psmouse) |