diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-14 16:20:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-14 16:20:05 -0700 |
| commit | 335a4a13be391638198608c6e130cbfce74c6b88 (patch) | |
| tree | f57856504298b6ae9ed48f4fbe617cc96478e0c1 /usb | |
| parent | 1fe452b0a8d0c0ae33d250082690a09d4ff286b4 (diff) | |
| download | patches-335a4a13be391638198608c6e130cbfce74c6b88.tar.gz | |
usb: build fix found by linux-next
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/usb/usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch b/usb/usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch index 53fb0873ce8d19..ed239184206623 100644 --- a/usb/usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch +++ b/usb/usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch @@ -31,12 +31,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/host/ohci-at91.c | 1 drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 43 +++++++++++++++++++++++++++++++++++++++++ - drivers/usb/host/ohci-omap.c | 2 - + drivers/usb/host/ohci-omap.c | 5 ++-- drivers/usb/host/ohci-pci.c | 43 ----------------------------------------- drivers/usb/host/ohci-pxa27x.c | 3 -- - drivers/usb/host/ohci-sm501.c | 2 - + drivers/usb/host/ohci-sm501.c | 5 ++-- drivers/usb/host/ohci-ssb.c | 1 - 8 files changed, 50 insertions(+), 47 deletions(-) + 8 files changed, 54 insertions(+), 49 deletions(-) --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -114,7 +114,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int any_connected) --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c -@@ -517,7 +517,7 @@ static int ohci_omap_resume(struct platf +@@ -510,14 +510,15 @@ static int ohci_omap_suspend(struct plat + + static int ohci_omap_resume(struct platform_device *dev) + { +- struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(dev)); ++ struct usb_hcd *hcd = platform_get_drvdata(dev); ++ struct ohci_hcd *ohci = hcd_to_ohci(hcd); + + if (time_before(jiffies, ohci->next_statechange)) + msleep(5); ohci->next_statechange = jiffies; omap_ohci_clock_power(1); @@ -197,7 +206,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c -@@ -238,7 +238,7 @@ static int ohci_sm501_resume(struct plat +@@ -231,14 +231,15 @@ static int ohci_sm501_suspend(struct pla + static int ohci_sm501_resume(struct platform_device *pdev) + { + struct device *dev = &pdev->dev; +- struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(pdev)); ++ struct usb_hcd *hcd = platform_get_drvdata(pdev); ++ struct ohci_hcd *ohci = hcd_to_ohci(hcd); + + if (time_before(jiffies, ohci->next_statechange)) + msleep(5); ohci->next_statechange = jiffies; sm501_unit_power(dev->parent, SM501_GATE_USB_HOST, 1); |