IRQ fixes
Subsystems (3)
Linus,
Please pull the latest irq-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus
# HEAD: 3424243e39e8ec138486926949e3668e7553125d irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function
An irqchip driver fix and a memory (over-)allocation fix.
Thanks,
Ingo
------------------>
Dan Carpenter (1):
irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function
Michael Kelley (1):
irq/matrix: Fix memory overallocation
drivers/irqchip/irq-mvebu-sei.c | 4 ++-- kernel/irq/matrix.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/irqchip/irq-mvebu-sei.c +2 -2
@@ -384,9 +384,9 @@ static int mvebu_sei_probe(struct platform_device *pdev) sei->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); sei->base =devm_ioremap_resource (sei->dev, sei->res); -if (!sei->base) { +if (IS_ERR (sei->base)) {dev_err (sei->dev,"Failed to remap SEI resource\n" ); -return -ENODEV ; +return PTR_ERR (sei->base); }/* Retrieve the SEI capabilities with the interrupt ranges */
kernel/irq/matrix.c +1 -1
@@ -8,7 +8,7 @@#include <linux/cpu.h> #include <linux/irq.h> -#define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS) * sizeof(unsigned long)) +#define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS))struct cpumap {unsigned int available;
Quoted 2 lines · Ingo Molnar
An irqchip driver fix and a memory (over-)allocation fix.
Pulled,
Linus