Skip to content

Commit

Permalink
phy: ti: tusb1210: Fix an error handling path in tusb1210_probe()
Browse files Browse the repository at this point in the history
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: 48969a5 ("phy: ti: tusb1210: Add charger detection")
Signed-off-by: Christophe JAILLET <[email protected]>
Reviewed-by: Hans de Goede <[email protected]>
Link: https://lore.kernel.org/r/07c4926c42243cedb3b6067a241bb486fdda01b5.1648991162.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Vinod Koul <[email protected]>
  • Loading branch information
tititiou36 authored and vinodkoul committed Apr 11, 2022
1 parent 5c8402c commit a9f17d0
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/phy/ti/phy-tusb1210.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a9f17d0

Please sign in to comment.