diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-23 16:56:19 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 16:51:52 -0600 |
| commit | d2f718398a21cdb925f12c2b332d206eacd967a6 (patch) | |
| tree | 9786559e08c8539945dcf98d8d95404b9e2c9bcb | |
| parent | 9a6b2e588c7809e86161236da3d29581bf5f8402 (diff) | |
| download | linux-3.10-d2f718398a21cdb925f12c2b332d206eacd967a6.tar.gz linux-3.10-d2f718398a21cdb925f12c2b332d206eacd967a6.tar.bz2 linux-3.10-d2f718398a21cdb925f12c2b332d206eacd967a6.zip | |
of/irq: Fix endian issues in parsing interrupt specifiers
This patch fixes some instances where interrupt specifiers are
dereferenced directly instead of doing a be32_to_cpu() conversion first.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | drivers/of/irq.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 65cfae1bd67..6e595e5a397 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -91,8 +91,8 @@ static struct device_node *of_irq_find_parent(struct device_node *child) * properties, for example when resolving PCI interrupts when no device * node exist for the parent. */ -int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize, - const u32 *addr, struct of_irq *out_irq) +int of_irq_map_raw(struct device_node *parent, const __be32 *intspec, + u32 ointsize, const __be32 *addr, struct of_irq *out_irq) { struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL; const __be32 *tmp, *imap, *imask; @@ -100,7 +100,8 @@ int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize, int imaplen, match, i; pr_debug("of_irq_map_raw: par=%s,intspec=[0x%08x 0x%08x...],ointsize=%d\n", - parent->full_name, intspec[0], intspec[1], ointsize); + parent->full_name, be32_to_cpup(intspec), + be32_to_cpup(intspec + 1), ointsize); ipar = of_node_get(parent); @@ -278,7 +279,7 @@ EXPORT_SYMBOL_GPL(of_irq_map_raw); int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq) { struct device_node *p; - const u32 *intspec, *tmp, *addr; + const __be32 *intspec, *tmp, *addr; u32 intsize, intlen; int res = -EINVAL; @@ -292,9 +293,9 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq intspec = of_get_property(device, "interrupts", &intlen); if (intspec == NULL) return -EINVAL; - intlen /= sizeof(u32); + intlen /= sizeof(*intspec); - pr_debug(" intspec=%d intlen=%d\n", *intspec, intlen); + pr_debug(" intspec=%d intlen=%d\n", be32_to_cpup(intspec), intlen); /* Get the reg property (if any) */ addr = of_get_property(device, "reg", NULL); |