Skip to content

Commit 2aa7174

Browse files
JackieLiu1krzk
authored andcommitted
ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc()
The s3c24xx_init_intc() returns an error pointer upon failure, not NULL. let's add an error pointer check in s3c24xx_handle_irq. s3c_intc[0] is not NULL or ERR, we can simplify the code. Fixes: 1f629b7 ("ARM: S3C24XX: transform irq handling into a declarative form") Signed-off-by: Jackie Liu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent 6880fa6 commit 2aa7174

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

arch/arm/mach-s3c/irq-s3c24xx.c

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,25 @@ static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc,
361361
static asmlinkage void __exception_irq_entry s3c24xx_handle_irq(struct pt_regs *regs)
362362
{
363363
do {
364-
if (likely(s3c_intc[0]))
365-
if (s3c24xx_handle_intc(s3c_intc[0], regs, 0))
366-
continue;
364+
/*
365+
* For platform based machines, neither ERR nor NULL can happen here.
366+
* The s3c24xx_handle_irq() will be set as IRQ handler iff this succeeds:
367+
*
368+
* s3c_intc[0] = s3c24xx_init_intc()
369+
*
370+
* If this fails, the next calls to s3c24xx_init_intc() won't be executed.
371+
*
372+
* For DT machine, s3c_init_intc_of() could set the IRQ handler without
373+
* setting s3c_intc[0] only if it was called with num_ctrl=0. There is no
374+
* such code path, so again the s3c_intc[0] will have a valid pointer if
375+
* set_handle_irq() is called.
376+
*
377+
* Therefore in s3c24xx_handle_irq(), the s3c_intc[0] is always something.
378+
*/
379+
if (s3c24xx_handle_intc(s3c_intc[0], regs, 0))
380+
continue;
367381

368-
if (s3c_intc[2])
382+
if (!IS_ERR_OR_NULL(s3c_intc[2]))
369383
if (s3c24xx_handle_intc(s3c_intc[2], regs, 64))
370384
continue;
371385

0 commit comments

Comments
 (0)