diff options
author | Nikhil P Rao <nikhil.rao@intel.com> | 2012-06-20 12:56:00 -0700 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2013-10-28 10:57:39 +0000 |
commit | 3e23299641a557af5d75a5cd522c7997fb987389 (patch) | |
tree | 69c94c7ed19c7e6753455a4b3f64634ae9a43882 | |
parent | d50f27ad3635f890ff40b67a745c33499a1134a4 (diff) |
PCI: fix truncation of resource size to 32 bits
commit d6776e6d5c2f8db0252f447b09736075e1bbe387 upstream.
_pci_assign_resource() took an int "size" argument, which meant that
sizes larger than 4GB were truncated. Change type to resource_size_t.
[bhelgaas: changelog]
Signed-off-by: Nikhil P Rao <nikhil.rao@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
-rw-r--r-- | drivers/pci/setup-res.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index eea85dafc763..be76ebacf486 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -206,7 +206,8 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev, return ret; } -static int _pci_assign_resource(struct pci_dev *dev, int resno, int size, resource_size_t min_align) +static int _pci_assign_resource(struct pci_dev *dev, int resno, + resource_size_t size, resource_size_t min_align) { struct resource *res = dev->resource + resno; struct pci_bus *bus; |