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>

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 814909f1ee630b34092e7e22fa6f764e0a1d9e3a..c4a47abfee68b227043dcd51c52367fac3a68fee 100644 (file)
--- 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) {