Skip to content

Commit ad00a32

Browse files
author
Marc Zyngier
committed
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 4ddfc45 commit ad00a32

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

arch/arm/common/sa1111.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,13 @@ static int sa1111_retrigger_irq(struct irq_data *d)
302302
break;
303303
}
304304

305-
if (i == 8)
305+
if (i == 8) {
306306
pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n",
307307
d->irq);
308-
return i == 8 ? -1 : 0;
308+
return 0;
309+
}
310+
311+
return 1;
309312
}
310313

311314
static int sa1111_type_irq(struct irq_data *d, unsigned int flags)

0 commit comments

Comments
 (0)