Skip to contentSkip to conversation

ASoC: fsl_ssi: Fix irq_of_parse_and_map() return value check

PATCH Applied Guenter Roeck 2 participants 4 messages Oct 3, 2013 – Oct 17, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: fsl_ssi: Fix irq_of_parse_and_map() return value check

irq_of_parse_and_map() returns 0 on error, not NO_IRQ.

Fix the following xtensa:allmodconfig build error.

sound/soc/fsl/fsl_ssi.c:705:26: error: 'NO_IRQ' undeclared (first use in this function) make[4]: *** [sound/soc/fsl/fsl_ssi.o] Error 1

Cc Geert Uytterhoeven <[email protected]>
Cc Grant Likely <[email protected]>

---
Previously submitted by Grant Likely as part of a different patch set. See https://lkml.org/lkml/2012/1/11/342.
Also see https://lkml.org/lkml/2013/7/25/642.

 sound/soc/fsl/fsl_ssi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/fsl_ssi.c +1 -1
index c6b7439..6b81d0c 100644
@@ -936,7 +936,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
 	ssi_private->ssi_phys = res.start;
 
 	ssi_private->irq = irq_of_parse_and_map(np, 0);
-	if (ssi_private->irq == NO_IRQ) {
+	if (ssi_private->irq == 0) {
 		dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
 		return -ENXIO;
 	}
Signature · 1 line
1.7.9.7
maintainer Applied
#1 lore raw
Quoted 1 line · Guenter Roeck

irq_of_parse_and_map() returns 0 on error, not NO_IRQ.

Applied, thanks.

#2 lore raw
Quoted 5 lines · Mark Brown
Quoted 1 line · Guenter Roeck

irq_of_parse_and_map() returns 0 on error, not NO_IRQ.

Applied, thanks.

Hi Mark,

do you plan to send this patch upstream anytime soon ?

It fixes an xtensa build problem, so it would be great if it could find its way into 3.13.

Thanks,
Guenter

maintainer
#3 lore raw
Quoted 1 line · Guenter Roeck

do you plan to send this patch upstream anytime soon ?

It'll go next time I send stuff if it hasn't already.