diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-19 12:26:57 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-19 12:26:57 -0700 |
| commit | 7e2987503dda95a5f80290bb8c06279009c2419e (patch) | |
| tree | e841944c911ada8d2b806e13d2c7b7320adaeb2f /drivers/pci/pcie/portdrv_bus.c | |
| parent | b1a45695bde0204597957e448923f09ce271ca80 (diff) | |
| parent | 49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/pci/pcie/portdrv_bus.c')
| -rw-r--r-- | drivers/pci/pcie/portdrv_bus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pcie/portdrv_bus.c b/drivers/pci/pcie/portdrv_bus.c index 4037a3e568d..3e84b501e6a 100644 --- a/drivers/pci/pcie/portdrv_bus.c +++ b/drivers/pci/pcie/portdrv_bus.c @@ -39,7 +39,8 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv) driver->id_table->vendor != pciedev->id.vendor) || (driver->id_table->device != PCI_ANY_ID && driver->id_table->device != pciedev->id.device) || - driver->id_table->port_type != pciedev->id.port_type || + (driver->id_table->port_type != PCIE_ANY_PORT && + driver->id_table->port_type != pciedev->id.port_type) || driver->id_table->service_type != pciedev->id.service_type ) return 0; |