aboutsummaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-qcom-mpm.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2022-04-10 07:25:49 -1000
committerLinus Torvalds <[email protected]>2022-04-10 07:25:49 -1000
commit1519610b533754c600effd8e25cd4aa44951a6a5 (patch)
treed19bb9e2a855eb78e3215d96a3fc12db1ea74144 /drivers/irqchip/irq-qcom-mpm.c
parent9c6913b7499cca943776cb0b02ea282113625580 (diff)
parent63ef1a8a07ef64f802af1adadae3b05ba824c534 (diff)
Merge tag 'irq-urgent-2022-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner: "A set of interrupt chip driver fixes: - A fix for a long standing bug in the ARM GICv3 redistributor polling which uses the wrong bit number to test. - Prevent translation of bogus ACPI table entries which map device interrupts into the IPI space on ARM GICs. - Don't write into the pending register of ARM GICV4 before the scan in hardware has completed. - A set of build and correctness fixes for the Qualcomm MPM driver" * tag 'irq-urgent-2022-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/gic, gic-v3: Prevent GSI to SGI translations irqchip/gic-v3: Fix GICR_CTLR.RWP polling irqchip/gic-v4: Wait for GICR_VPENDBASER.Dirty to clear before descheduling irqchip/irq-qcom-mpm: fix return value check in qcom_mpm_init() irq/qcom-mpm: Fix build error without MAILBOX
Diffstat (limited to 'drivers/irqchip/irq-qcom-mpm.c')
-rw-r--r--drivers/irqchip/irq-qcom-mpm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-qcom-mpm.c b/drivers/irqchip/irq-qcom-mpm.c
index eea5a753618c..d30614661eea 100644
--- a/drivers/irqchip/irq-qcom-mpm.c
+++ b/drivers/irqchip/irq-qcom-mpm.c
@@ -375,7 +375,7 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent)
raw_spin_lock_init(&priv->lock);
priv->base = devm_platform_ioremap_resource(pdev, 0);
- if (!priv->base)
+ if (IS_ERR(priv->base))
return PTR_ERR(priv->base);
for (i = 0; i < priv->reg_stride; i++) {