The following commit has been merged into the irq/core branch of tip:
Commit-ID: ad00a325a09791f4637bf5d2ec627ed2c292653e
Gitweb: https://git.kernel.org/tip/ad00a325a09791f4637bf5d2ec627ed2c292653e
Author: Marc Zyngier <maz@xxxxxxxxxx>
AuthorDate: Tue, 10 Mar 2020 18:49:20
Committer: Marc Zyngier <maz@xxxxxxxxxx>
CommitterDate: Mon, 16 Mar 2020 15:48:54
ARM: sa1111: Fix irq_retrigger callback return value
The irq_retrigger callback is supposed to return 0 when retrigger
has failed, and a non-zero value otherwise. Tell the core code
that the driver has succedded in using the HW to retrigger the
interrupt (if ever).
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20200310184921.23552-4-maz@xxxxxxxxxx
---
arch/arm/common/sa1111.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 947ef79..c98ebae 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -302,10 +302,13 @@ static int sa1111_retrigger_irq(struct irq_data *d)
break;
}
- if (i == 8)
+ if (i == 8) {
pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n",
d->irq);
- return i == 8 ? -1 : 0;
+ return 0;
+ }
+
+ return 1;
}
static int sa1111_type_irq(struct irq_data *d, unsigned int flags)
|