From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Aug 2012 05:13:17 +0000 (+1000)
Subject: Merge remote-tracking branch 'usb/usb-next'
X-Git-Tag: next-20120822~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5352c18e65e28d83ecd451d1b3ec6e087eaaea95;p=karo-tx-linux.git

Merge remote-tracking branch 'usb/usb-next'
---

5352c18e65e28d83ecd451d1b3ec6e087eaaea95
diff --cc drivers/usb/host/ehci-tegra.c
index 26dedb30ad0b,ba5039f1c5c2..75eca42dd607
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -797,21 -789,14 +789,15 @@@ static int tegra_ehci_remove(struct pla
  #endif
  
  	usb_remove_hcd(hcd);
 -	usb_put_hcd(hcd);
  
  	tegra_usb_phy_close(tegra->phy);
- 	iounmap(hcd->regs);
  
 +	usb_put_hcd(hcd);
 +
  	clk_disable_unprepare(tegra->clk);
- 	clk_put(tegra->clk);
  
  	clk_disable_unprepare(tegra->emc_clk);
- 	clk_put(tegra->emc_clk);
  
- 	kfree(tegra);
  	return 0;
  }