[PATCH] phy: ti: tusb1210: Fix an error handling path in tusb1210_probe()
Hans de Goede
hdegoede at redhat.com
Mon Apr 4 02:15:28 PDT 2022
Hi,
On 4/3/22 15:06, Christophe JAILLET wrote:
> tusb1210_probe_charger_detect() must be undone by a corresponding
> tusb1210_remove_charger_detect() in the error handling path, as already
> done in the remove function.
>
> Fixes: 48969a5623ed ("phy: ti: tusb1210: Add charger detection")
> Signed-off-by: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede at redhat.com>
Regards,
Hans
> ---
> drivers/phy/ti/phy-tusb1210.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/phy/ti/phy-tusb1210.c b/drivers/phy/ti/phy-tusb1210.c
> index a0cdbcadf09e..008d80977fc5 100644
> --- a/drivers/phy/ti/phy-tusb1210.c
> +++ b/drivers/phy/ti/phy-tusb1210.c
> @@ -537,12 +537,18 @@ static int tusb1210_probe(struct ulpi *ulpi)
> tusb1210_probe_charger_detect(tusb);
>
> tusb->phy = ulpi_phy_create(ulpi, &phy_ops);
> - if (IS_ERR(tusb->phy))
> - return PTR_ERR(tusb->phy);
> + if (IS_ERR(tusb->phy)) {
> + ret = PTR_ERR(tusb->phy);
> + goto err_remove_charger;
> + }
>
> phy_set_drvdata(tusb->phy, tusb);
> ulpi_set_drvdata(ulpi, tusb);
> return 0;
> +
> +err_remove_charger:
> + tusb1210_remove_charger_detect(tusb);
> + return ret;
> }
>
> static void tusb1210_remove(struct ulpi *ulpi)
More information about the linux-phy
mailing list