summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorLuo Meng <luomeng12@huawei.com>2020-11-25 02:45:23 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-11-25 02:48:45 +0100
commit855b69857830f8d918d715014f05e59a3f7491a0 (patch)
tree9ea1ffe6de522f605a9a266cef96643ff546db2d /drivers/input/serio
parentInput: soc_button_array - add missing include (diff)
downloadlinux-855b69857830f8d918d715014f05e59a3f7491a0.tar.xz
linux-855b69857830f8d918d715014f05e59a3f7491a0.zip
Input: i8042 - fix error return code in i8042_setup_aux()
Fix to return a negative error code from the error handling case instead of 0 in function i8042_setup_aux(), as done elsewhere in this function. Fixes: f81134163fc7 ("Input: i8042 - use platform_driver_probe") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Luo Meng <luomeng12@huawei.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20201123133420.4071187-1-luomeng12@huawei.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/i8042.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 944cbb519c6d..abae23af0791 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1471,7 +1471,8 @@ static int __init i8042_setup_aux(void)
if (error)
goto err_free_ports;
- if (aux_enable())
+ error = aux_enable();
+ if (error)
goto err_free_irq;
i8042_aux_irq_registered = true;