From 7d21212b2c56fb35e1a006413689594462300beb Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 21 Mar 2013 12:36:46 +0100
Subject: [PATCH] --- yaml --- r: 364407 b: refs/heads/master c:
 a4a83100a1653a389a5efaa68ad32c9b89010910 h: refs/heads/master i:   364405:
 dd63f3628fb75d8f3dc62584f36247be22d12b1e   364403:
 c1b426698ee7eaa92df3e3bdf0da0cde78a380a5   364399:
 8c76e7b022a059280293a55227346504e14a4b93 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/serial/usb-serial.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d9515e421a1a..e309a5ff0fb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30d9d42e9a7c205cc139dce743463b8070684df5
+refs/heads/master: a4a83100a1653a389a5efaa68ad32c9b89010910
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
index 3eb4d06e49be..456792952db6 100644
--- a/trunk/drivers/usb/serial/usb-serial.c
+++ b/trunk/drivers/usb/serial/usb-serial.c
@@ -572,13 +572,6 @@ static void port_release(struct device *dev)
 
 	dev_dbg(dev, "%s\n", __func__);
 
-	/*
-	 * Stop all the traffic before cancelling the work, so that
-	 * nobody will restart it by calling usb_serial_port_softint.
-	 */
-	kill_traffic(port);
-	cancel_work_sync(&port->work);
-
 	usb_free_urb(port->interrupt_in_urb);
 	usb_free_urb(port->interrupt_out_urb);
 	for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) {