Message ID | 1380773722-1295-1-git-send-email-linux@roeck-us.net (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On Wed, Oct 02, 2013 at 09:15:22PM -0700, Guenter Roeck wrote:
> irq_of_parse_and_map() returns 0 on error, not NO_IRQ.
Applied, thanks.
On 10/03/2013 08:58 AM, Mark Brown wrote: > On Wed, Oct 02, 2013 at 09:15:22PM -0700, Guenter Roeck wrote: >> 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
On Wed, Oct 16, 2013 at 06:57:53PM -0700, Guenter Roeck wrote:
> do you plan to send this patch upstream anytime soon ?
It'll go next time I send stuff if it hasn't already.
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index c6b7439..6b81d0c 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -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; }
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 <geert@linux-m68k.org> Cc: Grant Likely <grant.likely@linaro.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- 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(-)