summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-04-29 18:42:49 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-05-23 10:47:20 -0600
commit72dc5601fe5fec37cc1bd0efb19d99948fe7e54c (patch)
treeb8c874a0633ce7ce9111dd4f3b83aa06a4206f36 /drivers/pci
parentd1a313e4b6ccbb61c746ee10ac198970516e9afc (diff)
downloadlinux-72dc5601fe5fec37cc1bd0efb19d99948fe7e54c.tar.bz2
PCI: Don't convert BAR address to resource if dma_addr_t is too small
If dma_addr_t is too small to represent the BAR value, pcibios_bus_to_resource() will fail, so just remember the BAR size directly in the resource. The resource is already marked UNSET, so we know the address isn't valid anyway. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/probe.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index afae3bf405fa..82cd75f6118a 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -258,9 +258,10 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
pci_write_config_dword(dev, pos, 0);
pci_write_config_dword(dev, pos + 4, 0);
res->flags |= IORESOURCE_UNSET;
- region.start = 0;
- region.end = sz64;
+ res->start = 0;
+ res->end = sz64;
bar_disabled = true;
+ goto out;
} else {
region.start = l64;
region.end = l64 + sz64;