Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[cascardo/linux.git] / drivers / usb / host / ehci-pci.c

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 851006a..2a5d2fd 100644 (file)
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -42,6 +42,24 @@ static inline bool is_intel_quark_x1000(struct pci_dev *pdev)
                pdev->device == PCI_DEVICE_ID_INTEL_QUARK_X1000_SOC;
 }
 
+/*
+ * This is the list of PCI IDs for the devices that have EHCI USB class and
+ * specific drivers for that. One of the example is a ChipIdea device installed
+ * on some Intel MID platforms.
+ */
+static const struct pci_device_id bypass_pci_id_table[] = {
+       /* ChipIdea on Intel MID platform */
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0811), },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0829), },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe006), },
+       {}
+};
+
+static inline bool is_bypassed_id(struct pci_dev *pdev)
+{
+       return !!pci_match_id(bypass_pci_id_table, pdev);
+}
+
 /*
  * 0x84 is the offset of in/out threshold register,
  * and it is the same offset as the register of 'hostpc'.
@@ -352,6 +370,13 @@ static const struct ehci_driver_overrides pci_overrides __initconst = {
 
 /*-------------------------------------------------------------------------*/
 
+static int ehci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+       if (is_bypassed_id(pdev))
+               return -ENODEV;
+       return usb_hcd_pci_probe(pdev, id);
+}
+
 /* PCI driver selection metadata; PCI hotplugging uses this */
 static const struct pci_device_id pci_ids [] = { {
        /* handle any USB 2.0 EHCI controller */
@@ -370,7 +395,7 @@ static struct pci_driver ehci_pci_driver = {
        .name =         (char *) hcd_name,
        .id_table =     pci_ids,
 
-       .probe =        usb_hcd_pci_probe,
+       .probe =        ehci_pci_probe,
        .remove =       usb_hcd_pci_remove,
        .shutdown =     usb_hcd_pci_shutdown,