diff mbox

Input: ps2-gpio - actually abort probe when connected to sleeping GPIOs

Message ID 20171023234447.qaohcuyfvnwn5m2n@dtor-ws (mailing list archive)
State New, archived
Headers show

Commit Message

Dmitry Torokhov Oct. 23, 2017, 11:44 p.m. UTC
We've been missing a goto to the unwind path...

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/serio/ps2-gpio.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Danilo Krummrich Oct. 24, 2017, 7:08 a.m. UTC | #1
On 2017-10-24 01:44, Dmitry Torokhov wrote:
> We've been missing a goto to the unwind path...
> 
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>  drivers/input/serio/ps2-gpio.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/input/serio/ps2-gpio.c 
> b/drivers/input/serio/ps2-gpio.c
> index b50e3817f3c4..c62cceb97bb1 100644
> --- a/drivers/input/serio/ps2-gpio.c
> +++ b/drivers/input/serio/ps2-gpio.c
> @@ -366,6 +366,7 @@ static int ps2_gpio_probe(struct platform_device 
> *pdev)
>  	    gpiod_cansleep(drvdata->gpio_clk)) {
>  		dev_err(dev, "GPIO data or clk are connected via slow bus\n");
>  		error = -EINVAL;
> +		goto err_free_serio;
Good catch, thanks.
>  	}
> 
>  	drvdata->irq = platform_get_irq(pdev, 0);
> --
> 2.15.0.rc0.271.g36b669edcc-goog
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
index b50e3817f3c4..c62cceb97bb1 100644
--- a/drivers/input/serio/ps2-gpio.c
+++ b/drivers/input/serio/ps2-gpio.c
@@ -366,6 +366,7 @@  static int ps2_gpio_probe(struct platform_device *pdev)
 	    gpiod_cansleep(drvdata->gpio_clk)) {
 		dev_err(dev, "GPIO data or clk are connected via slow bus\n");
 		error = -EINVAL;
+		goto err_free_serio;
 	}
 
 	drvdata->irq = platform_get_irq(pdev, 0);