summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-06-18 12:14:16 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-06-18 12:14:16 -0600
commit140217ae3fbabc7b718b5595fd251ce2afcb3bc1 (patch)
tree1c3d1a367c04203a88b4677376cbd6c8e08d1c65 /drivers/pci/pci.c
parente822a007047fb84cd068bfa35a682015e0fe19b9 (diff)
parent0bdb3b213ac64f9a16e59d57660174543eaa01f0 (diff)
downloadlinux-140217ae3fbabc7b718b5595fd251ce2afcb3bc1.tar.gz
linux-140217ae3fbabc7b718b5595fd251ce2afcb3bc1.tar.bz2
linux-140217ae3fbabc7b718b5595fd251ce2afcb3bc1.zip
Merge branch 'topic/jan-intx-masking' into next
* topic/jan-intx-masking: PCI: add Ralink RT2800 broken INTx masking quirk PCI: add Chelsio T310 10GbE NIC broken INTx masking quirk PCI: add infrastructure for devices with broken INTx masking
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ae5d96ac2aac..d4d758d7b726 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2897,6 +2897,9 @@ bool pci_intx_mask_supported(struct pci_dev *dev)
bool mask_supported = false;
u16 orig, new;
+ if (dev->broken_intx_masking)
+ return false;
+
pci_cfg_access_lock(dev);
pci_read_config_word(dev, PCI_COMMAND, &orig);