diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 18:34:29 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 18:34:29 +0300 |
| commit | 78f098383a7abb1eb9dfd45346773fe80a65f05a (patch) | |
| tree | d9d3958960cefe5206fb2df9dff78aac450ec2c4 /drivers/pci/probe.c | |
| parent | acc886ec934980a45ae8962dbe88e221a40c77a2 (diff) | |
| parent | e3adec72a3c50b733eb277a9f93c044f59ff55eb (diff) | |
| download | linux-78f098383a7abb1eb9dfd45346773fe80a65f05a.tar.xz | |
Merge branch 'pci/resource' into next
* pci/resource:
PCI: Don't resize resources when realigning all devices in system
PCI: Don't reassign resources that are already aligned
PCI: Factor pci_reassigndev_resource_alignment()
powerpc/powernv: Override pcibios_default_alignment() to force PCI devices to be page aligned
PCI: Add pcibios_default_alignment() for arch-specific alignment control
PCI: Fix calculation of bridge window's size and alignment
PCI: Ignore requested alignment for IOV BARs
PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index f2bd0024cb88..5548044afb5b 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -231,7 +231,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->flags |= IORESOURCE_ROM_ENABLE; l64 = l & PCI_ROM_ADDRESS_MASK; sz64 = sz & PCI_ROM_ADDRESS_MASK; - mask64 = (u32)PCI_ROM_ADDRESS_MASK; + mask64 = PCI_ROM_ADDRESS_MASK; } if (res->flags & IORESOURCE_MEM_64) { |