Revert "usb: tegra: increase delay for y-cable detection on tn8"

[sojka/nv-tegra/linux-3.10.git] / drivers / usb / gadget / tegra_udc.c

diff --git a/drivers/usb/gadget/tegra_udc.c b/drivers/usb/gadget/tegra_udc.c
index 86009f73409b53a71a65a13858de599f58a36fb1..ed0c91f8514f0e0ee956c84273f33b84b07cc374 100644 (file)
--- a/drivers/usb/gadget/tegra_udc.c
+++ b/drivers/usb/gadget/tegra_udc.c
@@ -1474,17 +1474,22 @@ static int tegra_usb_set_charging_current(struct tegra_udc *udc)
        }
 
        ret = 0;
+       /*
+        * we set charging regulator's maximum charging current 1st, then
+        * notify the charging type.
+        */
        if (NULL != udc->vbus_reg && !udc->vbus_in_lp0) {
-               tegra_udc_set_extcon_state(udc);
                if (udc->connect_type != udc->connect_type_lp0 ||
                                        udc->connect_type == CONNECT_TYPE_NONE)
                        ret = regulator_set_current_limit(udc->vbus_reg,
                                                                 0, max_ua);
        }
 
-       if (!udc->vbus_in_lp0)
-               udc->connect_type_lp0 = CONNECT_TYPE_NONE;
 
+       if (!udc->vbus_in_lp0) {
+               tegra_udc_set_extcon_state(udc);
+               udc->connect_type_lp0 = CONNECT_TYPE_NONE;
+       }
        return ret;
 }