From: Johan Hovold Date: Thu, 21 Mar 2013 11:36:50 +0000 (+0100) Subject: USB: serial: clean up usb-serial bus device removal X-Git-Tag: v3.10-rc1~190^2~176 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5cb27dde2e8b7bcbdce6de270c73c021a65caff8;p=platform%2Fupstream%2Fkernel-adaptation-pc.git USB: serial: clean up usb-serial bus device removal Make sure to unregister the tty-device before calling subdriver port_remove. This way remove will reverse probe, and specifically any port data released in port_remove will be available throughout tty unregister. Note that the order currently does not matter as the tty-layer can make callbacks also after the device has been unregistered. This is handled in usb-serial core using the disconnected flag, which is already set when usb-serial bus device remove is called. Cc: Peter Hurley Reported-by: Peter Hurley Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c index 37decb1..3c4db6d 100644 --- a/drivers/usb/serial/bus.c +++ b/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);