diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2006-07-01 22:13:04 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-27 11:58:50 -0700 |
| commit | 114b368c07964caa3f4e1fa575b16e87fa11936c (patch) | |
| tree | 74500e47040be3bf4923eebd60404fc7b62004a9 /drivers/usb/core/generic.c | |
| parent | 2bf4086d7a7722b470aa24e1be725cc58619c6fe (diff) | |
usbcore: fix up device and power state tests
This patch (as734) rationalizes the various tests of device state and
power states. There are duplications and mistaken tests in several
places.
Perhaps the most interesting challenge is where the hub driver tests to
see that all the child devices are suspended before allowing itself to
be suspended. When CONFIG_USB_SUSPEND is set the test is
straightforward, since we expect that the children _will_ be suspended.
But when CONFIG_USB_SUSPEND isn't set, it's not so clear what should be
done. The code compromises by checking the child's
power.power_state.event field.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/generic.c')
| -rw-r--r-- | drivers/usb/core/generic.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index b6dacd7551d2..5358e656477c 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -195,9 +195,6 @@ static int generic_suspend(struct usb_device *udev, pm_message_t msg) static int generic_resume(struct usb_device *udev) { - if (udev->state == USB_STATE_NOTATTACHED) - return 0; - return usb_port_resume(udev); } |