phy: ti: tusb1210: Fix an error handling path in tusb1210_probe()

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@wanadoo.fr>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/07c4926c42243cedb3b6067a241bb486fdda01b5.1648991162.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/ti/phy-tusb1210.c b/drivers/phy/ti/phy-tusb1210.c
index c5bd74874f734dd9c4254d6a9c7ef73ea74bf4cb..c3ab4b69ea680ff08a538cac8cad2a40ca8430f7 100644 (file)
--- 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)