diff options
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index bf1d9abc07ac..a4b12404ae08 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -75,13 +75,6 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include <linux/config.h> | 77 | #include <linux/config.h> |
78 | |||
79 | #ifdef CONFIG_USB_DEBUG | ||
80 | # define DEBUG | ||
81 | #else | ||
82 | # undef DEBUG | ||
83 | #endif | ||
84 | |||
85 | #include <linux/module.h> | 78 | #include <linux/module.h> |
86 | #include <linux/moduleparam.h> | 79 | #include <linux/moduleparam.h> |
87 | #include <linux/pci.h> | 80 | #include <linux/pci.h> |
@@ -802,7 +795,6 @@ static int ohci_restart (struct ohci_hcd *ohci) | |||
802 | int temp; | 795 | int temp; |
803 | int i; | 796 | int i; |
804 | struct urb_priv *priv; | 797 | struct urb_priv *priv; |
805 | struct usb_device *root = ohci_to_hcd(ohci)->self.root_hub; | ||
806 | 798 | ||
807 | /* mark any devices gone, so they do nothing till khubd disconnects. | 799 | /* mark any devices gone, so they do nothing till khubd disconnects. |
808 | * recycle any "live" eds/tds (and urbs) right away. | 800 | * recycle any "live" eds/tds (and urbs) right away. |
@@ -811,11 +803,7 @@ static int ohci_restart (struct ohci_hcd *ohci) | |||
811 | */ | 803 | */ |
812 | spin_lock_irq(&ohci->lock); | 804 | spin_lock_irq(&ohci->lock); |
813 | disable (ohci); | 805 | disable (ohci); |
814 | for (i = 0; i < root->maxchild; i++) { | 806 | usb_root_hub_lost_power(ohci_to_hcd(ohci)->self.root_hub); |
815 | if (root->children [i]) | ||
816 | usb_set_device_state (root->children[i], | ||
817 | USB_STATE_NOTATTACHED); | ||
818 | } | ||
819 | if (!list_empty (&ohci->pending)) | 807 | if (!list_empty (&ohci->pending)) |
820 | ohci_dbg(ohci, "abort schedule...\n"); | 808 | ohci_dbg(ohci, "abort schedule...\n"); |
821 | list_for_each_entry (priv, &ohci->pending, pending) { | 809 | list_for_each_entry (priv, &ohci->pending, pending) { |