aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/urb.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2007-09-10 11:34:26 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 17:55:26 -0400
commit6840d2555afd66290be7a39b400b5e66a840b82d (patch)
treecfc969126e5915db6536382cddbfdd9a63f5b3c8 /drivers/usb/core/urb.c
parent95cf82f99cfbd697c15572c444bd4f54f19745b0 (diff)
USB: flush outstanding URBs when suspending
This patch (as989) makes usbcore flush all outstanding URBs for each device as the device is suspended. This will be true even when CONFIG_USB_SUSPEND is not enabled. In addition, an extra can_submit flag is added to the usb_device structure. That flag will be turned off whenever a suspend request has been received for the device, even if the device isn't actually suspended because CONFIG_USB_SUSPEND isn't set. It's no longer necessary to check for the device state being equal to USB_STATE_SUSPENDED during URB submission; that check can be replaced by a check of the can_submit flag. This also permits us to remove some questionable references to the deprecated power.power_state 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/urb.c')
-rw-r--r--drivers/usb/core/urb.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 76db76fdb4ec..c20c03aaf012 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -286,9 +286,6 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
286 return -EINVAL; 286 return -EINVAL;
287 if (!(dev = urb->dev) || dev->state < USB_STATE_DEFAULT) 287 if (!(dev = urb->dev) || dev->state < USB_STATE_DEFAULT)
288 return -ENODEV; 288 return -ENODEV;
289 if (dev->bus->controller->power.power_state.event != PM_EVENT_ON
290 || dev->state == USB_STATE_SUSPENDED)
291 return -EHOSTUNREACH;
292 289
293 /* For now, get the endpoint from the pipe. Eventually drivers 290 /* For now, get the endpoint from the pipe. Eventually drivers
294 * will be required to set urb->ep directly and we will eliminate 291 * will be required to set urb->ep directly and we will eliminate