Re: linux-next: build failure after merge of the usb tree

Alan Stern
2010-05-18T13:54:48Z

On Tue, 18 May 2010, Stephen Rothwell wrote:

> Hi Greg,
>
> After merging the usb tree, today's linux-next build (powerpc
> ppc6xx_defconfig) failed like this:
>
> drivers/usb/host/ehci-fsl.c:316: error: 'ehci' undeclared (first use in this function)
>
> Caused by commit d19f8cd047971b43844d61d995be736dacb4826a ("USB: EHCI:
> fix controller wakeup flag settings during suspend").

Here's a fix for the problem. It's awfully easy to mess things up when
changing code for architectures you don't have.

Greg, can you merge this in with the original patch?

Alan Stern

Index: usb-2.6/drivers/usb/host/ehci-fsl.c
===================================================================
--- usb-2.6.orig/drivers/usb/host/ehci-fsl.c
+++ usb-2.6/drivers/usb/host/ehci-fsl.c
@@ -313,7 +313,7 @@ static int ehci_fsl_drv_suspend(struct d
struct ehci_fsl *ehci_fsl = hcd_to_ehci_fsl(hcd);
void __iomem *non_ehci = hcd->regs;

- ehci_prepare_ports_for_controller_suspend(ehci);
+ ehci_prepare_ports_for_controller_suspend(hcd_to_ehci(hcd));
if (!fsl_deep_sleep())
return 0;