diff options
| author | Alan Stern | 2007-09-20 18:37:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2007-10-12 23:55:28 +0200 |
| commit | 7108f28465a0a37d5afc05c5ad788938423b74a7 (patch) | |
| tree | eb7e15a097d8d4b0e826ffa8f1613bea4e091140 /drivers | |
| parent | USB: unusual_devs update for Nokia 6131 (diff) | |
| download | kernel-qcow2-linux-7108f28465a0a37d5afc05c5ad788938423b74a7.tar.gz kernel-qcow2-linux-7108f28465a0a37d5afc05c5ad788938423b74a7.tar.xz kernel-qcow2-linux-7108f28465a0a37d5afc05c5ad788938423b74a7.zip | |
USB: don't propagate FREEZE or PRETHAW suspends
This patch (as992) fixes a recently-added bug. During a FREEZE or
PRETHAW suspend notification, non-root devices don't actually get
suspended. So we shouldn't tell their parent hubs that they did.
(This code path used to be skipped over, until the FREEZE/PRETHAW test
got moved out of usb_suspend_both() into generic_suspend().)
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/core/driver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index ba5bbc7eedcc..3f734240e0ec 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -1112,7 +1112,12 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) usb_hcd_flush_endpoint(udev, udev->ep_out[i]); usb_hcd_flush_endpoint(udev, udev->ep_in[i]); } - if (parent) + + /* If this is just a FREEZE or a PRETHAW, udev might + * not really be suspended. Only true suspends get + * propagated up the device tree. + */ + if (parent && udev->state == USB_STATE_SUSPENDED) usb_autosuspend_device(parent); } |