diff options
author | Jean-Jacques Hiblot <jjhiblot@traphandler.com> | 2014-02-14 11:46:15 -0700 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-14 11:46:15 -0700 |
commit | 4f4bde1df33bde076f53325bdf2c6430cf85e1bb (patch) | |
tree | 3e0bbed5759513bbca96e605d3dbc4336efc0b41 /drivers/pci/host/pci-mvebu.c | |
parent | a760d2fb2c700469f2578f980e30423bcba316ac (diff) | |
download | linux-stable-4f4bde1df33bde076f53325bdf2c6430cf85e1bb.tar.gz linux-stable-4f4bde1df33bde076f53325bdf2c6430cf85e1bb.tar.bz2 linux-stable-4f4bde1df33bde076f53325bdf2c6430cf85e1bb.zip |
PCI: mvebu: Fix potential issue in range parsing
The second parameter of of_read_number() is not the index, but a size. As
it happens, in this case it may work just fine because of the conversion to
u32 and the favorable endianness on this architecture.
Fixes: 11be65472a427 ("PCI: mvebu: Adapt to the new device tree layout")
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Cc: stable@vger.kernel.org # v3.12+
Diffstat (limited to 'drivers/pci/host/pci-mvebu.c')
-rw-r--r-- | drivers/pci/host/pci-mvebu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 0e79665afd44..05e352889868 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -797,7 +797,7 @@ static int mvebu_get_tgt_attr(struct device_node *np, int devfn, for (i = 0; i < nranges; i++) { u32 flags = of_read_number(range, 1); - u32 slot = of_read_number(range, 2); + u32 slot = of_read_number(range + 1, 1); u64 cpuaddr = of_read_number(range + na, pna); unsigned long rtype; |