diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-04-30 02:42:49 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-23 18:47:20 +0200 |
| commit | 72dc5601fe5fec37cc1bd0efb19d99948fe7e54c (patch) | |
| tree | b8c874a0633ce7ce9111dd4f3b83aa06a4206f36 /drivers | |
| parent | PCI: Reject BAR above 4GB if dma_addr_t is too small (diff) | |
| download | linux-72dc5601fe5fec37cc1bd0efb19d99948fe7e54c.tar.xz linux-72dc5601fe5fec37cc1bd0efb19d99948fe7e54c.zip | |
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')
| -rw-r--r-- | drivers/pci/probe.c | 5 |
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; |