ChangeSet 1.1341, 2003/10/09 10:30:27-07:00, paulus@samba.org

[PATCH] USB: Fix USB suspend in 2.6.0-test6

In drivers/usb/core/hcd-pci.c, the code forgets to set hcd->state to
USB_STATE_SUSPENDED on suspend.  The effect is that on resume, the
code refuses to wake the HCD up, and instead prints a message saying
the interface hasn't been suspended.

The patch below fixes this.  It is against 2.6.0-test6.  With this
patch I can suspend and resume my Apple PowerBook G4, and the USB
works after resuming.


 drivers/usb/core/hcd-pci.c |    2 ++
 1 files changed, 2 insertions(+)


diff -Nru a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
--- a/drivers/usb/core/hcd-pci.c	Fri Oct 10 16:02:44 2003
+++ b/drivers/usb/core/hcd-pci.c	Fri Oct 10 16:02:44 2003
@@ -295,6 +295,8 @@
 		if (retval)
 			dev_dbg (hcd->controller, "suspend fail, retval %d\n",
 					retval);
+		else
+			hcd->state = USB_STATE_SUSPENDED;
 	}
 
  	pci_set_power_state (dev, state);