usb: hub: keep hub->dev reference all the time when struct usb_hub lives

[cascardo/linux.git] / drivers / usb / core / hub.c

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index d541929..6a9f11f 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1635,6 +1635,7 @@ static void hub_release(struct kref *kref)
 {
        struct usb_hub *hub = container_of(kref, struct usb_hub, kref);
 
+       usb_put_dev(hub->hdev);
        usb_put_intf(to_usb_interface(hub->intfdev));
        kfree(hub);
 }
@@ -1800,6 +1801,7 @@ descriptor_error:
        INIT_DELAYED_WORK(&hub->leds, led_work);
        INIT_DELAYED_WORK(&hub->init_work, NULL);
        usb_get_intf(intf);
+       usb_get_dev(hdev);
 
        usb_set_intfdata (intf, hub);
        intf->needs_remote_wakeup = 1;
@@ -5026,10 +5028,9 @@ static void hub_events(void)
 
                hub = list_entry(tmp, struct usb_hub, event_list);
                kref_get(&hub->kref);
-               hdev = hub->hdev;
-               usb_get_dev(hdev);
                spin_unlock_irq(&hub_event_lock);
 
+               hdev = hub->hdev;
                hub_dev = hub->intfdev;
                intf = to_usb_interface(hub_dev);
                dev_dbg(hub_dev, "state %d ports %d chg %04x evt %04x\n",
@@ -5142,7 +5143,6 @@ static void hub_events(void)
                usb_autopm_put_interface(intf);
  loop_disconnected:
                usb_unlock_device(hdev);
-               usb_put_dev(hdev);
                kref_put(&hub->kref, hub_release);
 
        } /* end while (1) */