diff options
author | David Brownell <david-b@pacbell.net> | 2005-09-27 13:38:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 19:47:41 -0400 |
commit | b13296c6617f22e8c0174a7af32780617db0e680 (patch) | |
tree | 980ed483e5df92335894405ac7eb37380598190d /drivers/usb/core/urb.c | |
parent | 5edbfb7c8af0577097dae87cdd4dfdba82bb9579 (diff) |
[PATCH] updates for "controller suspended" handling
Reject URBs to _all_ devices when their host controllers are suspended;
even root hub registers will be unavailable. Also, don't reject urbs
to root hubs in other cases; the only upstream link is through that
controller (on PCI or whatever SOC bus is in use).
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/core/hcd.c | 28 ++++++++++++----------------
drivers/usb/core/urb.c | 3 ++-
2 files changed, 14 insertions(+), 17 deletions(-)
Diffstat (limited to 'drivers/usb/core/urb.c')
-rw-r--r-- | drivers/usb/core/urb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index b32898e0a27..f2a1fed2a80 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c | |||
@@ -237,7 +237,8 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) | |||
237 | (dev->state < USB_STATE_DEFAULT) || | 237 | (dev->state < USB_STATE_DEFAULT) || |
238 | (!dev->bus) || (dev->devnum <= 0)) | 238 | (!dev->bus) || (dev->devnum <= 0)) |
239 | return -ENODEV; | 239 | return -ENODEV; |
240 | if (dev->state == USB_STATE_SUSPENDED) | 240 | if (dev->bus->controller->power.power_state.event != PM_EVENT_ON |
241 | || dev->state == USB_STATE_SUSPENDED) | ||
241 | return -EHOSTUNREACH; | 242 | return -EHOSTUNREACH; |
242 | if (!(op = dev->bus->op) || !op->submit_urb) | 243 | if (!(op = dev->bus->op) || !op->submit_urb) |
243 | return -ENODEV; | 244 | return -ENODEV; |