diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-07-12 10:34:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 20:13:39 -0400 |
commit | 72119743651054ceddd4fdf0cce161bdb4cc4aac (patch) | |
tree | 515382b62c40af493dc6293b5d8d512579f02d34 /drivers/usb | |
parent | 08d7660d45bc3e14b0fafe2e891ca50b4b18591a (diff) |
usb: host: tegra: pass correct pointer in ehci_setup()
The ehci_setup() require the pointer of usb_hcd.
Passing the correct pointer in place of ehci_hcd
pointer.
This is side effect of change:
commit 1a49e2ac9651df7349867a5cf44e2c83de1046af
Author: Alan Stern <stern@rowland.harvard.edu>
EHCI: centralize controller initialization
[Although I checked for this specifically, obviously I missed some of
the calls. In addition to the mistake in ehci-tegra.c that Laxman
fixed here, the same thing needs to be fixed in ehci-orion.c and
ehci-xls.c. -- Alan Stern]
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/ehci-orion.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-tegra.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-xls.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 3e411230953b..9408da83eaf1 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
@@ -106,7 +106,7 @@ static int ehci_orion_setup(struct usb_hcd *hcd) | |||
106 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 106 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
107 | int retval; | 107 | int retval; |
108 | 108 | ||
109 | retval = ehci_setup(ehci); | 109 | retval = ehci_setup(hcd); |
110 | if (retval) | 110 | if (retval) |
111 | return retval; | 111 | return retval; |
112 | 112 | ||
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 65360945df78..562c80e2bfe0 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c | |||
@@ -285,7 +285,7 @@ static int tegra_ehci_setup(struct usb_hcd *hcd) | |||
285 | /* switch to host mode */ | 285 | /* switch to host mode */ |
286 | hcd->has_tt = 1; | 286 | hcd->has_tt = 1; |
287 | 287 | ||
288 | retval = ehci_setup(ehci); | 288 | retval = ehci_setup(hcd); |
289 | if (retval) | 289 | if (retval) |
290 | return retval; | 290 | return retval; |
291 | 291 | ||
diff --git a/drivers/usb/host/ehci-xls.c b/drivers/usb/host/ehci-xls.c index 99c353a85ae4..8dc6a22d90b8 100644 --- a/drivers/usb/host/ehci-xls.c +++ b/drivers/usb/host/ehci-xls.c | |||
@@ -18,7 +18,7 @@ static int ehci_xls_setup(struct usb_hcd *hcd) | |||
18 | 18 | ||
19 | ehci->caps = hcd->regs; | 19 | ehci->caps = hcd->regs; |
20 | 20 | ||
21 | return ehci_setup(ehci); | 21 | return ehci_setup(hcd); |
22 | } | 22 | } |
23 | 23 | ||
24 | int ehci_xls_probe_internal(const struct hc_driver *driver, | 24 | int ehci_xls_probe_internal(const struct hc_driver *driver, |