[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.

diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index 6070530a09f4efc6cd83ed6537df728e9f50b672..c106bd577f693f025346043af31013070f326ad2 100644 (file)
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -295,6 +295,8 @@ int usb_hcd_pci_suspend (struct pci_dev *dev, u32 state)
                if (retval)
                        dev_dbg (hcd->controller, "suspend fail, retval %d\n",
                                        retval);
+               else
+                       hcd->state = USB_STATE_SUSPENDED;
        }
 
        pci_set_power_state (dev, state);