Re: [USB] uhci-hcd oops on APM resume (2.5.23-26)

[Greg KH]

On Thu, Jul 18, 2002 at 11:28:23PM -0700, Craig Kulesa wrote:
> 
> 
> Looks fine.  Works great!  Upon the first APM suspend:

Hm, does this patch from Jan Harkes solve the uhci-hcd resume problem
for you?

thanks,

greg k-h

--- linux-2.5.24.orig/drivers/usb/host/uhci-hcd.c	Fri Jun 21 14:56:12 2002
+++ linux-2.5.24/drivers/usb/host/uhci-hcd.c	Sun Jul  7 01:18:44 2002
@@ -2074,6 +2074,8 @@
 
 	/* Run and mark it configured with a 64-byte max packet */
 	outw(USBCMD_RS | USBCMD_CF | USBCMD_MAXP, io_addr + USBCMD);
+
+	uhci->hcd.state = USB_STATE_READY;
 }
 
 #ifdef CONFIG_PROC_FS
@@ -2364,8 +2366,6 @@
 
 	/* disable legacy emulation */
 	pci_write_config_word(dev, USBLEGSUP, USBLEGSUP_DEFAULT);
-
-        hcd->state = USB_STATE_READY;
 
 	usb_connect(uhci->rh_dev);
         uhci->rh_dev->speed = USB_SPEED_FULL;