From: Stephen Warren <swarren@nvidia.com>
Date: Fri, 14 Sep 2012 17:35:16 +0000 (-0600)
Subject: Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13981^2~3^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fef40b2369a4ececa16b4d02b625e45252fe5d0a;p=mirror_ubuntu-artful-kernel.git

Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2
---

fef40b2369a4ececa16b4d02b625e45252fe5d0a
diff --cc drivers/usb/host/ehci-tegra.c
index 26dedb30ad0b,65408f7ae92b..c0d47323b52a
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -799,12 -801,11 +801,12 @@@ static int tegra_ehci_remove(struct pla
  #endif
  
  	usb_remove_hcd(hcd);
 -	usb_put_hcd(hcd);
  
- 	tegra_usb_phy_close(tegra->phy);
+ 	usb_phy_shutdown(&tegra->phy->u_phy);
  	iounmap(hcd->regs);
  
 +	usb_put_hcd(hcd);
 +
  	clk_disable_unprepare(tegra->clk);
  	clk_put(tegra->clk);