OSDN Git Service

phy: lpc18xx-usb-otg: error handling in lpc18xx_usb_otg_phy_power_on()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Thu, 22 Feb 2018 21:40:11 +0000 (00:40 +0300)
committerKishon Vijay Abraham I <kishon@ti.com>
Fri, 16 Mar 2018 08:10:42 +0000 (13:40 +0530)
If regmap_update_bits() fails in lpc18xx_usb_otg_phy_power_on(),
lpc->clk is left enabled.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
drivers/phy/phy-lpc18xx-usb-otg.c

index 3b7a71e..7de280a 100644 (file)
@@ -60,8 +60,14 @@ static int lpc18xx_usb_otg_phy_power_on(struct phy *phy)
                return ret;
 
        /* The bit in CREG is cleared to enable the PHY */
-       return regmap_update_bits(lpc->reg, LPC18XX_CREG_CREG0,
+       ret = regmap_update_bits(lpc->reg, LPC18XX_CREG_CREG0,
                                  LPC18XX_CREG_CREG0_USB0PHY, 0);
+       if (ret) {
+               clk_disable(lpc->clk);
+               return ret;
+       }
+
+       return 0;
 }
 
 static int lpc18xx_usb_otg_phy_power_off(struct phy *phy)