1 files changed, 26 insertions, 17 deletions

diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
index dd8ef36ab10e..c0d6ff1baa72 100644
--- a/drivers/usb/usbip/stub_dev.c
+++ b/drivers/usb/usbip/stub_dev.c
@@ -300,9 +300,9 @@ static int stub_probe(struct usb_device *udev)
         struct stub_device *sdev = NULL;
         const char *udev_busid = dev_name(&udev->dev);
         struct bus_id_priv *busid_priv;
-        int rc;
+        int rc = 0;
 
-        dev_dbg(&udev->dev, "Enter\n");
+        dev_dbg(&udev->dev, "Enter probe\n");
 
         /* check we should claim or not by busid_table */
         busid_priv = get_busid_priv(udev_busid);
@@ -317,13 +317,15 @@ static int stub_probe(struct usb_device *udev)
                  * other matched drivers by the driver core.
                  * See driver_probe_device() in driver/base/dd.c
                  */
-                return -ENODEV;
+                rc = -ENODEV;
+                goto call_put_busid_priv;
         }
 
         if (udev->descriptor.bDeviceClass == USB_CLASS_HUB) {
                 dev_dbg(&udev->dev, "%s is a usb hub device... skip!\n",
                          udev_busid);
-                return -ENODEV;
+                rc = -ENODEV;
+                goto call_put_busid_priv;
         }
 
         if (!strcmp(udev->bus->bus_name, "vhci_hcd")) {
@@ -331,13 +333,16 @@ static int stub_probe(struct usb_device *udev)
                         "%s is attached on vhci_hcd... skip!\n",
                         udev_busid);
 
-                return -ENODEV;
+                rc = -ENODEV;
+                goto call_put_busid_priv;
         }
 
         /* ok, this is my device */
         sdev = stub_device_alloc(udev);
-        if (!sdev)
-                return -ENOMEM;
+        if (!sdev) {
+                rc = -ENOMEM;
+                goto call_put_busid_priv;
+        }
 
         dev_info(&udev->dev,
                 "usbip-host: register new device (bus %u dev %u)\n",
@@ -369,7 +374,9 @@ static int stub_probe(struct usb_device *udev)
         }
         busid_priv->status = STUB_BUSID_ALLOC;
 
-        return 0;
+        rc = 0;
+        goto call_put_busid_priv;
+
 err_files:
         usb_hub_release_port(udev->parent, udev->portnum,
                              (struct usb_dev_state *) udev);
@@ -379,6 +386,9 @@ err_port:
 
         busid_priv->sdev = NULL;
         stub_device_free(sdev);
+
+call_put_busid_priv:
+        put_busid_priv(busid_priv);
         return rc;
 }
 
@@ -404,7 +414,7 @@ static void stub_disconnect(struct usb_device *udev)
         struct bus_id_priv *busid_priv;
         int rc;
 
-        dev_dbg(&udev->dev, "Enter\n");
+        dev_dbg(&udev->dev, "Enter disconnect\n");
 
         busid_priv = get_busid_priv(udev_busid);
         if (!busid_priv) {
@@ -417,7 +427,7 @@ static void stub_disconnect(struct usb_device *udev)
         /* get stub_device */
         if (!sdev) {
                 dev_err(&udev->dev, "could not get device");
-                return;
+                goto call_put_busid_priv;
         }
 
         dev_set_drvdata(&udev->dev, NULL);
@@ -432,12 +442,12 @@ static void stub_disconnect(struct usb_device *udev)
                                   (struct usb_dev_state *) udev);
         if (rc) {
                 dev_dbg(&udev->dev, "unable to release port\n");
-                return;
+                goto call_put_busid_priv;
         }
 
         /* If usb reset is called from event handler */
         if (usbip_in_eh(current))
-                return;
+                goto call_put_busid_priv;
 
         /* shutdown the current connection */
         shutdown_busid(busid_priv);
@@ -448,12 +458,11 @@ static void stub_disconnect(struct usb_device *udev)
         busid_priv->sdev = NULL;
         stub_device_free(sdev);
 
-        if (busid_priv->status == STUB_BUSID_ALLOC) {
+        if (busid_priv->status == STUB_BUSID_ALLOC)
                 busid_priv->status = STUB_BUSID_ADDED;
-        } else {
-                busid_priv->status = STUB_BUSID_OTHER;
-                del_match_busid((char *)udev_busid);
-        }
+
+call_put_busid_priv:
+        put_busid_priv(busid_priv);
 }
 
 #ifdef CONFIG_PM