diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-05 12:46:57 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-05 12:46:57 +0530 |
| commit | 292a8fbb52fb5f2841092c492c1a9176ab8e4d4a (patch) | |
| tree | 3247300064e95a4022020a2c1fc92e8d22b0e39c /drivers/usb/host/ehci-tegra.c | |
| parent | 5fc8ea3995bfdddd064d6d14b883ff6ee9fd55b9 (diff) | |
| parent | 6af42a88c75a0978f8c2c51d09ad2e2e49b6fd67 (diff) | |
Merge branch 'android-tegra-nv-3.4' into android-t114-3.4
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
Change-Id: I9ce33061dcbf7ce41a2fe04da4e7b754b2a659c8
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/usb/host/ehci-tegra.c')
| -rw-r--r-- | drivers/usb/host/ehci-tegra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index bb1f718f6670..530dba31893d 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -280,7 +280,7 @@ static int tegra_ehci_hub_control( if (wValue == USB_PORT_FEAT_SUSPEND) { tegra_usb_phy_post_suspend(tegra->phy); } else if (wValue == USB_PORT_FEAT_RESET) { - if (ehci->reset_done[0] && wIndex == 0) + if (ehci->reset_done[0] && wIndex == 1) tegra_usb_phy_bus_reset(tegra->phy); } else if (wValue == USB_PORT_FEAT_POWER) { if (wIndex == 1) |