summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-11-04 04:12:09 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-11-04 04:12:09 +0300
commite9ebc2151f88600e726e51e5f7ca9c33ad53b35f (patch)
tree5b709aba6075f4e2f94e9ed9f09e868df7be63ab /drivers
parentd2ff0ff2c23f1bacd35073bf50e6c18298a8d530 (diff)
parent3424243e39e8ec138486926949e3668e7553125d (diff)
downloadlinux-e9ebc2151f88600e726e51e5f7ca9c33ad53b35f.tar.xz
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 overallocation
Diffstat (limited to 'drivers')
-rw-r--r--drivers/irqchip/irq-mvebu-sei.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-mvebu-sei.c b/drivers/irqchip/irq-mvebu-sei.c
index 566d69a2edbc..add4c9c934c8 100644
--- a/drivers/irqchip/irq-mvebu-sei.c
+++ b/drivers/irqchip/irq-mvebu-sei.c
@@ -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 */