Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar: "An irqchip driver fix and a memory (over-)allocation fix" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function irq/matrix: Fix memory overallocationhifive-unleashed-5.1
commit
e9ebc2151f
|
@ -384,9 +384,9 @@ static int mvebu_sei_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
sei->base = devm_ioremap_resource(sei->dev, sei->res);
|
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");
|
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 */
|
/* Retrieve the SEI capabilities with the interrupt ranges */
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include <linux/cpu.h>
|
#include <linux/cpu.h>
|
||||||
#include <linux/irq.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 {
|
struct cpumap {
|
||||||
unsigned int available;
|
unsigned int available;
|
||||||
|
|
Loading…
Reference in New Issue