Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 073350f7b562d06df0aedd36c963508e36437b3c

Authored by Roland Stigge
Committed by Chris Ball
1 parent 14006bfbd2
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mmc: mmc_spi: Fix return value evaluation of irq_of_parse_and_map() 

When irq_of_parse_and_map() returns an error, it does as zero. But in
mmc_spi_get_pdata(), the error return case is compared against NO_IRQ.
This might work where NO_IRQ is zero (defaults to zero when undefined,
as on MIPS) but not where NO_IRQ is different, e.g. on ARM where it's -1.

This patch changes to comparison with 0 which is the error return value
of irq_of_parse_and_map().

Tested on ARM that mmc_spi is working now.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: Chris Ball <cjb@laptop.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/mmc/host/of_mmc_spi.c
Diff comments   View file @ 073350f
... ... @@ -146,7 +146,7 @@
146 146 oms->pdata.get_ro = of_mmc_spi_get_ro;
147 147  
148 148 oms->detect_irq = irq_of_parse_and_map(np, 0);
149   - if (oms->detect_irq != NO_IRQ) {
  149 + if (oms->detect_irq != 0) {
150 150 oms->pdata.init = of_mmc_spi_init;
151 151 oms->pdata.exit = of_mmc_spi_exit;
152 152 } else {