diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-08 01:29:19 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-08 01:29:19 +0300 |
commit | 26db8f992444a87465fc01b264b0317a3943e2b6 (patch) | |
tree | d269270f5247d54906861ff75c4e28de227f2ce0 | |
parent | 21f85778bd037f6d7652a79a60657599edf39ef6 (diff) | |
parent | b28ace12661fbcfd90959c1e84ff5a85113a82a1 (diff) | |
download | linux-26db8f992444a87465fc01b264b0317a3943e2b6.tar.xz |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull IRQ fix from Ingo Molnar:
"Fix an ARM TI DRA7XX SoC irqchip driver local variables type
bug/warning"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/crossbar: Fix incorrect type of local variables
-rw-r--r-- | drivers/irqchip/irq-crossbar.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index 1eef56a89b1f..05bbf171df37 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c @@ -198,7 +198,8 @@ static const struct irq_domain_ops crossbar_domain_ops = { static int __init crossbar_of_init(struct device_node *node) { - int i, size, max = 0, reserved = 0, entry; + int i, size, reserved = 0; + u32 max = 0, entry; const __be32 *irqsr; int ret = -ENOMEM; |