This patch applies to Richard's tree at https://github.com/riczhao/kernel-imx/commits/topics/usb-driver. It fixes an issue introduced with commit: acfc0b8 USB: chipidea: add set_vbus_power support That commit switches form a permanent vbus enable to set_vbus_power(), the permanent regulator_enable() is removed but the corresponding regulator_disable() are forgotten. This patch removes the leftover regulator_disable(). Cc: Richard Zhao <richard.zhao@xxxxxxxxxxxxx> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> --- drivers/usb/chipidea/ci13xxx_imx.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/usb/chipidea/ci13xxx_imx.c b/drivers/usb/chipidea/ci13xxx_imx.c index dd7f3a3..32e3e68 100644 --- a/drivers/usb/chipidea/ci13xxx_imx.c +++ b/drivers/usb/chipidea/ci13xxx_imx.c @@ -123,7 +123,6 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) } } - /* we only support host now, so enable vbus here */ reg_vbus = devm_regulator_get(&pdev->dev, "vbus"); if (!IS_ERR(reg_vbus)) data->reg_vbus = reg_vbus; @@ -167,8 +166,6 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) return 0; err: - if (reg_vbus) - regulator_disable(reg_vbus); if (phy_np) of_node_put(phy_np); clk_disable_unprepare(data->clk); @@ -182,9 +179,6 @@ static int __devexit ci13xxx_imx_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); ci13xxx_remove_device(data->ci_pdev); - if (data->reg_vbus) - regulator_disable(data->reg_vbus); - if (data->phy) { usb_phy_shutdown(data->phy); module_put(data->phy->dev->driver->owner); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
