hso: move tty_unregister outside hso_serial_common_free()

[firefly-linux-kernel-4.4.55.git] / drivers / net / usb / hso.c

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 1e85ae76539e44e6d7b19e6ad839b279d0221ef1..5d885888658e3481c3089ef6bb607d91839813a4 100644 (file)
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2234,14 +2234,17 @@ static int hso_stop_serial_device(struct hso_device *hso_dev)
        return 0;
 }
 
-static void hso_serial_common_free(struct hso_serial *serial)
+static void hso_serial_tty_unregister(struct hso_serial *serial)
 {
-       int i;
-
        if (serial->parent->dev)
                device_remove_file(serial->parent->dev, &dev_attr_hsotype);
 
        tty_unregister_device(tty_drv, serial->minor);
+}
+
+static void hso_serial_common_free(struct hso_serial *serial)
+{
+       int i;
 
        for (i = 0; i < serial->num_rx_urbs; i++) {
                /* unlink and free RX URB */
@@ -2323,6 +2326,7 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
 
        return 0;
 exit:
+       hso_serial_tty_unregister(serial);
        hso_serial_common_free(serial);
        return -1;
 }
@@ -2683,6 +2687,7 @@ static struct hso_device *hso_create_bulk_serial_device(
        return hso_dev;
 
 exit2:
+       hso_serial_tty_unregister(serial);
        hso_serial_common_free(serial);
 exit:
        hso_free_tiomget(serial);
@@ -3102,6 +3107,7 @@ static void hso_free_interface(struct usb_interface *interface)
                        mutex_lock(&serial->parent->mutex);
                        serial->parent->usb_gone = 1;
                        mutex_unlock(&serial->parent->mutex);
+                       hso_serial_tty_unregister(serial);
                        kref_put(&serial_table[i]->ref, hso_serial_ref_free);
                }
        }