summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@cs.washington.edu>2006-12-03 11:55:34 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-20 10:54:42 -0800
commit0c875c28649eac0adb8d2e2efac2186c3089e100 (patch)
treec74e0dcfdab8c1a69a4882dab375659cd5b31f99 /drivers/pci
parent42a0ee3238a0adb4c5bea3bd5b201c297b476e66 (diff)
downloadop-kernel-dev-0c875c28649eac0adb8d2e2efac2186c3089e100.zip
op-kernel-dev-0c875c28649eac0adb8d2e2efac2186c3089e100.tar.gz
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/quirks.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 9ca9b9b..7571863 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)
* a single one having MSI is enough to be sure that MSI are supported.
*/
pdev = pci_get_slot(dev->bus, 0);
- if (dev->subordinate && !msi_ht_cap_enabled(dev)
- && !msi_ht_cap_enabled(pdev)) {
+ if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
printk(KERN_WARNING "PCI: MSI quirk detected. "
"MSI disabled on chipset %s.\n",
pci_name(dev));
OpenPOWER on IntegriCloud