USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage

If for some reason we fail to set the voltage range for the VDDCX regulator
when removing it's better to still disable and free the regulator as that
avoids leaking a reference to it and is likely to ensure that it's turned
off completely.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/otg/msm_otg.c b/drivers/usb/otg/msm_otg.c
index db69b2ac92649b94c43cd41202f3f1e7c80a529e..b276f8fcdeba7970f24f2457e406112cc0721743 100644 (file)
--- a/drivers/usb/otg/msm_otg.c
+++ b/drivers/usb/otg/msm_otg.c
@@ -93,11 +93,9 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
        } else {
                ret = regulator_set_voltage(hsusb_vddcx, 0,
                        USB_PHY_VDD_DIG_VOL_MAX);
-               if (ret) {
+               if (ret)
                        dev_err(motg->otg.dev, "unable to set the voltage "
                                        "for hsusb vddcx\n");
-                       return ret;
-               }
                ret = regulator_disable(hsusb_vddcx);
                if (ret)
                        dev_err(motg->otg.dev, "unable to disable hsusb vddcx\n");