diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-04 02:12:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-04 02:12:09 +0100 |
| commit | e9ebc2151f88600e726e51e5f7ca9c33ad53b35f (patch) | |
| tree | 5b709aba6075f4e2f94e9ed9f09e868df7be63ab /drivers | |
| parent | Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... (diff) | |
| parent | irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function (diff) | |
| download | linux-e9ebc2151f88600e726e51e5f7ca9c33ad53b35f.tar.xz linux-e9ebc2151f88600e726e51e5f7ca9c33ad53b35f.zip | |
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.c | 4 |
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 */ |