diff options
author | David Rientjes <rientjes@cs.washington.edu> | 2006-12-03 14:55:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-20 13:54:42 -0500 |
commit | 0c875c28649eac0adb8d2e2efac2186c3089e100 (patch) | |
tree | c74e0dcfdab8c1a69a4882dab375659cd5b31f99 | |
parent | 42a0ee3238a0adb4c5bea3bd5b201c297b476e66 (diff) |
PCI quirks: remove redundant check
Removes redundant check for dev->subordinate; if it is NULL, the function
returns before the patch-affected code region.
Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
Acked-by: Brice Goglin <brice@myri.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/pci/quirks.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 9ca9b9bf6160..757186390d83 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
@@ -1688,8 +1688,7 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev) | |||
1688 | * a single one having MSI is enough to be sure that MSI are supported. | 1688 | * a single one having MSI is enough to be sure that MSI are supported. |
1689 | */ | 1689 | */ |
1690 | pdev = pci_get_slot(dev->bus, 0); | 1690 | pdev = pci_get_slot(dev->bus, 0); |
1691 | if (dev->subordinate && !msi_ht_cap_enabled(dev) | 1691 | if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) { |
1692 | && !msi_ht_cap_enabled(pdev)) { | ||
1693 | printk(KERN_WARNING "PCI: MSI quirk detected. " | 1692 | printk(KERN_WARNING "PCI: MSI quirk detected. " |
1694 | "MSI disabled on chipset %s.\n", | 1693 | "MSI disabled on chipset %s.\n", |
1695 | pci_name(dev)); | 1694 | pci_name(dev)); |