From 5e105a49585567593bc427ab1a14c29560591174 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Fri, 6 Feb 2009 15:01:54 +0100 Subject: [PATCH] --- yaml --- r: 133494 b: refs/heads/master c: d55c0ae6b243bb8e247259089b3a2e47ebfabdf6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/generic.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 7b93a8d94884..7213f99b40cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8bece8d91f9ed9cff3c98920802f1b3046b7560 +refs/heads/master: d55c0ae6b243bb8e247259089b3a2e47ebfabdf6 diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c index 814909f1ee63..c4a47abfee68 100644 --- a/trunk/drivers/usb/serial/generic.c +++ b/trunk/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) {