---

yaml --- r: 364411 b: refs/heads/master c: 5cb27dd h: refs/heads/master i: 364409: 993ed09 364407: 7d21212 v: v3
git-mirror · Mar 25, 2013 · 29cf309 · 29cf309
1 parent eba75e9
commit 29cf309
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a5c821cad1459ec2b5fd5778f46d13c4255a7bf
+refs/heads/master: 5cb27dde2e8b7bcbdce6de270c73c021a65caff8
diff --git a/trunk/drivers/usb/serial/bus.c b/trunk/drivers/usb/serial/bus.c
@@ -106,14 +106,15 @@ static int usb_serial_device_remove(struct device *dev)
 	/* make sure suspend/resume doesn't race against port_remove */
 	usb_autopm_get_interface(port->serial->interface);
 
+	minor = port->number;
+	tty_unregister_device(usb_serial_tty_driver, minor);
+
 	device_remove_file(&port->dev, &dev_attr_port_number);
 
 	driver = port->serial->type;
 	if (driver->port_remove)
 		retval = driver->port_remove(port);
 
-	minor = port->number;
-	tty_unregister_device(usb_serial_tty_driver, minor);
 	dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
 		 driver->description, minor);