From 235e8a92ebba20ad0445a068db541d068f703b51 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 21 Mar 2013 12:36:41 +0100
Subject: [PATCH] --- yaml --- r: 364402 b: refs/heads/master c:
 f8f0ad8621cf01e1e3f8264863b270c2308a9c1a h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/serial/generic.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index cbe09369452c..97d4315efba4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 618e183d03a95da200bed48e5277efe428feef26
+refs/heads/master: f8f0ad8621cf01e1e3f8264863b270c2308a9c1a
diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c
index 131d6cbeefee..a6d0ac638e0a 100644
--- a/trunk/drivers/usb/serial/generic.c
+++ b/trunk/drivers/usb/serial/generic.c
@@ -102,7 +102,7 @@ int usb_serial_generic_open(struct tty_struct *tty, struct usb_serial_port *port
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_open);
 
-static void generic_cleanup(struct usb_serial_port *port)
+void usb_serial_generic_close(struct usb_serial_port *port)
 {
 	unsigned long flags;
 	int i;
@@ -120,11 +120,6 @@ static void generic_cleanup(struct usb_serial_port *port)
 			usb_kill_urb(port->read_urbs[i]);
 	}
 }
-
-void usb_serial_generic_close(struct usb_serial_port *port)
-{
-	generic_cleanup(port);
-}
 EXPORT_SYMBOL_GPL(usb_serial_generic_close);
 
 int usb_serial_generic_prepare_write_buffer(struct usb_serial_port *port,
@@ -507,11 +502,6 @@ EXPORT_SYMBOL_GPL(usb_serial_generic_resume);
 
 void usb_serial_generic_disconnect(struct usb_serial *serial)
 {
-	int i;
-
-	/* stop reads and writes on all ports */
-	for (i = 0; i < serial->num_ports; ++i)
-		generic_cleanup(serial->port[i]);
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_disconnect);