From david-b@pacbell.net Sun Sep 3 13:17:05 2006 From: David Brownell To: Greg KH Subject: USB: ohci-at91, two one-liners Date: Sun, 3 Sep 2006 12:21:50 -0700 Cc: linux-usb-devel@lists.sourceforge.net, Andrew Victor Content-Disposition: inline Message-Id: <200609031221.50914.david-b@pacbell.net> 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 --- drivers/usb/host/ohci-at91.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- gregkh-2.6.orig/drivers/usb/host/ohci-at91.c +++ gregkh-2.6/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(stru if (!clocked) { clk_enable(iclk); clk_enable(fclk); + clocked = 1; } return 0;