---

yaml --- r: 364407 b: refs/heads/master c: a4a8310 h: refs/heads/master i: 364405: dd63f36 364403: c1b4266 364399: 8c76e7b v: v3
git-mirror · Mar 25, 2013 · 7d21212 · 7d21212
1 parent 602b7a0
commit 7d21212
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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) {