From: Alan Stern Date: Tue, 19 Sep 2006 14:08:43 +0000 (-0400) Subject: USB: fix root-hub resume when CONFIG_USB_SUSPEND is not set X-Git-Tag: v2.6.19-rc1~899^2~27 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=592fbbe4bc339399d363dd55f0391e0623400706;p=linux-2.6 USB: fix root-hub resume when CONFIG_USB_SUSPEND is not set This patch (as786) removes a redundant test and fixes a problem involving repeated system sleeps when CONFIG_USB_SUSPEND is not set. During the first wakeup, the root hub's dev.power.power_state.event field doesn't get updated, causing it not to be suspended during the second sleep transition. This takes care of the issue raised by Rafael J. Wysocki and Mattia Dongili. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 2b2000ac05..0d063c8ca4 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -1071,10 +1071,15 @@ int usb_resume_both(struct usb_device *udev) PM_EVENT_ON) status = -EHOSTUNREACH; } - if (status == 0 && udev->state == USB_STATE_SUSPENDED) + if (status == 0) status = resume_device(udev); if (parent) mutex_unlock(&parent->pm_mutex); + } else { + + /* Needed only for setting udev->dev.power.power_state.event + * and for possible debugging message. */ + status = resume_device(udev); } /* Now the parent won't suspend until we are finished */