diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-05-17 19:57:47 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-05-17 19:57:47 +0200 |
| commit | b4764905ea5b2e5314ef3aed96e1c5a5df9318c2 (patch) | |
| tree | 31d49abaf0332bf117443dea54f7524275a93a9c /arch | |
| parent | d07f6ca923ea0927a1024dfccafc5b53b61cfecc (diff) | |
| parent | fbb80d5ad400a12ec67214a0e7e9f9497dc9e615 (diff) | |
| download | linux-b4764905ea5b2e5314ef3aed96e1c5a5df9318c2.tar.bz2 | |
Merge tag 'irqchip-fixes-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes from Marc Zyngier:
- Fix PXA Mainstone CPLD irq allocation in legacy mode
- Restrict the Apple AIC controller to the Apple platform
- Remove a few supperfluous messages on devm_ioremap_resource() failure
Link: https://lore.kernel.org/r/20210516122217.13234-1-maz@kernel.org
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/pxa_cplds_irqs.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa_cplds_irqs.c b/arch/arm/mach-pxa/pxa_cplds_irqs.c index ec0d9b094744..bddfc7cd5d40 100644 --- a/arch/arm/mach-pxa/pxa_cplds_irqs.c +++ b/arch/arm/mach-pxa/pxa_cplds_irqs.c @@ -121,8 +121,13 @@ static int cplds_probe(struct platform_device *pdev) return fpga->irq; base_irq = platform_get_irq(pdev, 1); - if (base_irq < 0) + if (base_irq < 0) { base_irq = 0; + } else { + ret = devm_irq_alloc_descs(&pdev->dev, base_irq, base_irq, CPLDS_NB_IRQ, 0); + if (ret < 0) + return ret; + } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); fpga->base = devm_ioremap_resource(&pdev->dev, res); |