From: Luo Meng <luomeng12@huawei.com>
Date: Wed, 25 Nov 2020 01:45:23 +0000 (-0800)
Subject: Input: i8042 - fix error return code in i8042_setup_aux()
X-Git-Tag: v4.14.212~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bdc890dfb093fb24b0c92d2a693a184594c52cd4;p=users%2Fdwmw2%2Flinux.git

Input: i8042 - fix error return code in i8042_setup_aux()

commit 855b69857830f8d918d715014f05e59a3f7491a0 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 0e9f248370a3f..d95dd2b48cacf 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1458,7 +1458,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;