VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / usb / core / hcd-pci.c

diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index da209ad..e7a7ba5 100644 (file)
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -229,7 +229,6 @@ EXPORT_SYMBOL (usb_hcd_pci_probe);
 void usb_hcd_pci_remove (struct pci_dev *dev)
 {
        struct usb_hcd          *hcd;
-       struct usb_device       *hub;
 
        hcd = pci_get_drvdata(dev);
        if (!hcd)
@@ -239,17 +238,16 @@ void usb_hcd_pci_remove (struct pci_dev *dev)
        if (in_interrupt ())
                BUG ();
 
-       hub = hcd->self.root_hub;
        if (HCD_IS_RUNNING (hcd->state))
                hcd->state = USB_STATE_QUIESCING;
 
        dev_dbg (hcd->self.controller, "roothub graceful disconnect\n");
-       usb_disconnect (&hub);
+       usb_disconnect (&hcd->self.root_hub);
 
        hcd->driver->stop (hcd);
        hcd_buffer_destroy (hcd);
        hcd->state = USB_STATE_HALT;
-       pci_set_drvdata (dev, 0);
+       pci_set_drvdata(dev, NULL);
 
        free_irq (hcd->irq, hcd);
        if (hcd->driver->flags & HCD_MEMORY) {