linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / usb / host / ohci-pci.c

diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index b268537..1b09dde 100644 (file)
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -35,10 +35,7 @@ ohci_pci_start (struct usb_hcd *hcd)
        struct ohci_hcd *ohci = hcd_to_ohci (hcd);
        int             ret;
 
-       /* REVISIT this whole block should move to reset(), which handles
-        * all the other one-time init.
-        */
-       if (hcd->self.controller) {
+       if(hcd->self.controller && hcd->self.controller->bus == &pci_bus_type) {
                struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
 
                /* AMD 756, for most chips (early revs), corrupts register
@@ -48,8 +45,7 @@ ohci_pci_start (struct usb_hcd *hcd)
                                && pdev->device == 0x740c) {
                        ohci->flags = OHCI_QUIRK_AMD756;
                        ohci_dbg (ohci, "AMD756 erratum 4 workaround\n");
-                       /* also erratum 10 (suspend/resume issues) */
-                       device_init_wakeup(&hcd->self.root_hub->dev, 0);
+                       // also somewhat erratum 10 (suspend/resume issues)
                }
 
                /* FIXME for some of the early AMD 760 southbridges, OHCI
@@ -92,13 +88,6 @@ ohci_pci_start (struct usb_hcd *hcd)
                        ohci_dbg (ohci,
                                "enabled Compaq ZFMicro chipset quirk\n");
                }
-
-               /* RWC may not be set for add-in PCI cards, since boot
-                * firmware probably ignored them.  This transfers PCI
-                * PM wakeup capabilities (once the PCI layer is fixed).
-                */
-               if (device_may_wakeup(&pdev->dev))
-                       ohci->hc_control |= OHCI_CTRL_RWC;
        }
 
        /* NOTE: there may have already been a first reset, to
@@ -206,7 +195,7 @@ static const struct hc_driver ohci_pci_hc_driver = {
 
 static const struct pci_device_id pci_ids [] = { {
        /* handle any USB OHCI controller */
-       PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
+       PCI_DEVICE_CLASS((PCI_CLASS_SERIAL_USB << 8) | 0x10, ~0),
        .driver_data =  (unsigned long) &ohci_pci_hc_driver,
        }, { /* end: all zeroes */ }
 };