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

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

[Luo Meng]

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>
---
 drivers/input/serio/i8042.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
-- 
2.25.4

Re: [PATCH] Input: i8042 - fix error return code in i8042_setup_aux()

[Hans de Goede]

Hi,

On 11/23/20 2:34 PM, Luo Meng wrote:
> 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>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans

> ---
>  drivers/input/serio/i8042.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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;
> 

Re: [PATCH] Input: i8042 - fix error return code in i8042_setup_aux()

[Dmitry Torokhov]

On Mon, Nov 23, 2020 at 09:34:20PM +0800, Luo Meng wrote:
> 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>

Applied, thank you.

-- 
Dmitry