From: David Brownell Date: Sun, 3 Sep 2006 19:21:50 +0000 (-0700) Subject: USB: ohci-at91, two one-liners X-Git-Tag: v2.6.19-rc1~899^2~34 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;ds=sidebyside;h=cd22afda3f84452c6def29a68b06933e814e0e95;p=powerpc.git USB: ohci-at91, two one-liners This includes two one-liners forwarded to me for the OHCI support on at91: - KB920x (and other boards with CPUs in non-BGA packages) need a slightly different way to say "ignore that port, it's not pinned out"; - On resume, if we turn clocks on, record that we did so. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 5a5bdf374d..b466581beb 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -193,7 +193,7 @@ ohci_at91_start (struct usb_hcd *hcd) if ((ret = ohci_init(ohci)) < 0) return ret; - root->maxchild = board->ports; + ohci->num_ports = board->ports; if ((ret = ohci_run(ohci)) < 0) { err("can't start %s", hcd->self.bus_name); @@ -297,6 +297,7 @@ static int ohci_hcd_at91_drv_resume(struct platform_device *pdev) if (!clocked) { clk_enable(iclk); clk_enable(fclk); + clocked = 1; } return 0;