From 490cfb9b104c8d1f08b0bafa0117dfaf8c5a0b28 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 17 Apr 2013 18:10:07 -0600 Subject: [PATCH] --- yaml --- r: 362913 b: refs/heads/master c: 4d18760c67af2688a6f9d3f0131dc505e0b9f2c9 h: refs/heads/master i: 362911: 7576ee61d2438827ba88bbfec04d1c3bda2d4030 v: v3 --- [refs] | 2 +- trunk/drivers/pci/msi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e2fa8ccec99b..2d89d8ae2df9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78b5a310ce0ff22889e1a1af932e5c17b26962ba +refs/heads/master: 4d18760c67af2688a6f9d3f0131dc505e0b9f2c9 diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c index afdc388b9553..f8a1f39e4f68 100644 --- a/trunk/drivers/pci/msi.c +++ b/trunk/drivers/pci/msi.c @@ -605,8 +605,8 @@ static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries) pci_read_config_dword(dev, dev->msix_cap + PCI_MSIX_TABLE, &table_offset); - bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK); - table_offset &= ~PCI_MSIX_FLAGS_BIRMASK; + bir = (u8)(table_offset & PCI_MSIX_TABLE_BIR); + table_offset &= PCI_MSIX_TABLE_OFFSET; phys_addr = pci_resource_start(dev, bir) + table_offset; return ioremap_nocache(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE);