From: Dmitry Torokhov Date: Thu, 5 Sep 2024 04:17:12 +0000 (-0700) Subject: Input: sunkbd - use guard notation when pausing serio port X-Git-Tag: v6.13-rc1~95^2^2~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc656ececfac95a9ff9a58cbfc3042228c18c857;p=thirdparty%2Fkernel%2Flinux.git Input: sunkbd - use guard notation when pausing serio port Using guard notation makes the code more compact and error handling more robust by ensuring that serio ports are resumed in all code paths when control leaves critical section. Link: https://lore.kernel.org/r/20240905041732.2034348-8-dmitry.torokhov@gmail.com Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c index 72fb46029710d..3299e1919b370 100644 --- a/drivers/input/keyboard/sunkbd.c +++ b/drivers/input/keyboard/sunkbd.c @@ -241,9 +241,8 @@ static void sunkbd_reinit(struct work_struct *work) static void sunkbd_enable(struct sunkbd *sunkbd, bool enable) { - serio_pause_rx(sunkbd->serio); - sunkbd->enabled = enable; - serio_continue_rx(sunkbd->serio); + scoped_guard(serio_pause_rx, sunkbd->serio) + sunkbd->enabled = enable; if (!enable) { wake_up_interruptible(&sunkbd->wait);