summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2009-02-06 15:01:54 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-24 16:20:29 -0700
commitd55c0ae6b243bb8e247259089b3a2e47ebfabdf6 (patch)
treeb672bc3e307600b447e43a05f12392b7c5fd38db /drivers
parentf8bece8d91f9ed9cff3c98920802f1b3046b7560 (diff)
downloadop-kernel-dev-d55c0ae6b243bb8e247259089b3a2e47ebfabdf6.zip
op-kernel-dev-d55c0ae6b243bb8e247259089b3a2e47ebfabdf6.tar.gz
USB: serial generic resume function fix
This removes an unnecessary check for autoresume from the generic resume method. The check has been obsoleted by the now delayed increase of the usage counter which makes the error this check prevented impossible. This change allows drivers which only use the bulk read URB the use of the generic method even if they support autosuspend. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/generic.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 814909f..c4a47ab 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -177,14 +177,6 @@ int usb_serial_generic_resume(struct usb_serial *serial)
struct usb_serial_port *port;
int i, c = 0, r;
-#ifdef CONFIG_PM
- /*
- * If this is an autoresume, don't submit URBs.
- * They will be submitted in the open function instead.
- */
- if (serial->dev->auto_pm)
- return 0;
-#endif
for (i = 0; i < serial->num_ports; i++) {
port = serial->port[i];
if (port->port.count && port->read_urb) {
OpenPOWER on IntegriCloud