From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Aug 2012 14:15:30 +0000 (-0700)
Subject: Merge v3.6-rc3 into usb-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a7bdf7fa33127bf08eb0810698bca607a9462df4;p=linux-beck.git

Merge v3.6-rc3 into usb-next

This picks up fixes that we need in this branch for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

a7bdf7fa33127bf08eb0810698bca607a9462df4
diff --cc drivers/usb/host/ehci-tegra.c
index ba5039f1c5c2,26dedb30ad0b..75eca42dd607
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -789,14 -797,21 +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;
  }