aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorNikhil P Rao <nikhil.rao@intel.com>2012-06-20 12:56:00 -0700
committerBen Hutchings <ben@decadent.org.uk>2013-11-28 14:01:58 +0000
commitb538dfee448ce5711105363cd1ceca5b77705979 (patch)
tree27d0233126c95b73095d8a3fceeb6ab90caac80e /drivers/pci
parentd4bd91401f292ce14996bbdd1c5e99c43d572ae6 (diff)
downloadkernel_samsung_smdk4412-b538dfee448ce5711105363cd1ceca5b77705979.zip
kernel_samsung_smdk4412-b538dfee448ce5711105363cd1ceca5b77705979.tar.gz
kernel_samsung_smdk4412-b538dfee448ce5711105363cd1ceca5b77705979.tar.bz2
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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/setup-res.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 8b25f9c..41f08e5 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -188,7 +188,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;