diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-03-12 12:30:15 -0500 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-10-26 14:09:42 +0800 |
| commit | 2ea52b1ab34e318edd9817e20d2ce80f24497b8f (patch) | |
| tree | a481ff653e1f9a62b902a545590b4973048bb1a2 | |
| parent | a555537c5ed06b3ab1438da4da70f643999706ab (diff) | |
PCI: Fail pci_ioremap_bar() on unassigned resources
Make pci_ioremap_bar() fail if we're trying to map a BAR that hasn't been
assigned.
Normally pci_enable_device() will fail if a BAR hasn't been assigned, but a
driver can successfully call pci_enable_device_io() even if a memory BAR
hasn't been assigned. That driver should not be able to use
pci_ioremap_bar() to map that unassigned memory BAR.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 646c0282df04265f77ebd5ad3beae671e59acd5b)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 22b5aabca6dc..9b86a4304703 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -129,7 +129,7 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) /* * Make sure the BAR is actually a memory resource, not an IO resource */ - if (!(res->flags & IORESOURCE_MEM)) { + if (res->flags & IORESOURCE_UNSET || !(res->flags & IORESOURCE_MEM)) { dev_warn(&pdev->dev, "can't ioremap BAR %d: %pR\n", bar, res); return NULL; } |