From 29cf3090157c71f28de0c7e248ffb0dfa33fd4e1 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 21 Mar 2013 12:36:50 +0100 Subject: [PATCH] --- yaml --- r: 364411 b: refs/heads/master c: 5cb27dde2e8b7bcbdce6de270c73c021a65caff8 h: refs/heads/master i: 364409: 993ed09f86ec33dd52af54b3bbbd86804259e62b 364407: 7d21212b2c56fb35e1a006413689594462300beb v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/bus.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 66799a6daf8e..82877127c44a 100644 --- 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 index 37decb13d7eb..3c4db6d196c6 100644 --- 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);