diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-23 19:28:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-23 19:28:20 +0300 |
| commit | f73d2a429334dbd30bc9a7e5ef5e07a676d3d499 (patch) | |
| tree | 1ba71d2f8b4f4bcc3efeb45d61b31495055b4f0a /arch | |
| parent | 7de7ac8d60697d844489b6a68649fa9873174eec (diff) | |
| parent | b4764905ea5b2e5314ef3aed96e1c5a5df9318c2 (diff) | |
| download | linux-f73d2a429334dbd30bc9a7e5ef5e07a676d3d499.tar.xz | |
Merge tag 'irq-urgent-2021-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"A few fixes for irqchip drivers:
- Allocate interrupt descriptors correctly on Mainstone PXA when
SPARSE_IRQ is enabled; otherwise the interrupt association fails
- Make the APPLE AIC chip driver depend on APPLE
- Remove redundant error output on devm_ioremap_resource() failure"
* tag 'irq-urgent-2021-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: Remove redundant error printing
irqchip/apple-aic: APPLE_AIC should depend on ARCH_APPLE
ARM: PXA: Fix cplds irqdesc allocation when using legacy mode
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); |