leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: fix root-hub resume when CONFIG_USB_SUSPEND is not set

Browse Source 
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 <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2006-09-19 10:08:43 -04:00 committed by Greg Kroah-Hartman
parent 02c399ee45
commit 592fbbe4bc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/core/driver.c
View File

@ -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 */