Merge branch 'master' into next

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 814909f1ee63..9d57cace3731 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) {
@@ -196,6 +188,7 @@ int usb_serial_generic_resume(struct usb_serial *serial)
 
         return c ? -EIO : 0;
 }
+EXPORT_SYMBOL_GPL(usb_serial_generic_resume);
 
 void usb_serial_generic_close(struct tty_struct *tty,
                         struct usb_serial_port *port, struct file *filp)