diff options
| author | Roland Stigge <stigge@antcom.de> | 2013-01-30 18:05:08 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-02-24 14:37:10 -0500 |
| commit | 073350f7b562d06df0aedd36c963508e36437b3c (patch) | |
| tree | dfe27cee73f05f35523d41e679ac5ef1f8a417d3 /drivers/mmc | |
| parent | 14006bfbd2fe9f1307dc3350d7a12004ddd7fce0 (diff) | |
| download | op-kernel-dev-073350f7b562d06df0aedd36c963508e36437b3c.zip op-kernel-dev-073350f7b562d06df0aedd36c963508e36437b3c.tar.gz | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/of_mmc_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c index 1534b58..d720b5e 100644 --- a/drivers/mmc/host/of_mmc_spi.c +++ b/drivers/mmc/host/of_mmc_spi.c @@ -146,7 +146,7 @@ struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi) oms->pdata.get_ro = of_mmc_spi_get_ro; oms->detect_irq = irq_of_parse_and_map(np, 0); - if (oms->detect_irq != NO_IRQ) { + if (oms->detect_irq != 0) { oms->pdata.init = of_mmc_spi_init; oms->pdata.exit = of_mmc_spi_exit; } else { |
