On Mar 24 2017 or thereabouts, Dmitry Torokhov wrote:
> If rmi_enable_sensor() fails in rmi_driver_probe(), we should not return
> immediately, but disable IRQs and tear down function list.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> ---
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
Cheers,
Benjamin
> drivers/input/rmi4/rmi_driver.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
> index d9cfe4ec93fa..daba87c7e707 100644
> --- a/drivers/input/rmi4/rmi_driver.c
> +++ b/drivers/input/rmi4/rmi_driver.c
> @@ -1229,16 +1229,21 @@ static int rmi_driver_probe(struct device *dev)
> if (retval < 0)
> goto err_destroy_functions;
>
> - if (data->f01_container->dev.driver)
> + if (data->f01_container->dev.driver) {
> /* Driver already bound, so enable ATTN now. */
> - return rmi_enable_sensor(rmi_dev);
> + retval = rmi_enable_sensor(rmi_dev);
> + if (retval)
> + goto err_disable_irq;
> + }
>
> return 0;
>
> +err_disable_irq:
> + rmi_disable_irq(rmi_dev, false);
> err_destroy_functions:
> rmi_free_function_list(rmi_dev);
> err:
> - return retval < 0 ? retval : 0;
> + return retval;
> }
>
> static struct rmi_driver rmi_physical_driver = {
> --
> 2.12.1.578.ge9c3154ca4-goog
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
