[PATCH] mmc: Fix EINVAL if an mmc_spi controller has no IRQ

From: Chris Boot
Date: Fri May 25 2012 - 13:00:30 EST


irq_of_parse_and_map() returns EINVAL if there is no interrupt
information available in device tree, not NO_IRQ. mmc_spi_get_pdata()
doesn't account for error returns, and ends up trying to
request_threaded_irq() with -22 as the IRQ value.

This patch checks for negative returns from irq_of_parse_and_map() as
well as NO_IRQ, and uses polled mode in those cases.

Signed-off-by: Chris Boot <bootc@xxxxxxxxx>
---
drivers/mmc/host/of_mmc_spi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index 1534b58..d3e882a 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 != NO_IRQ && oms->detect_irq > 0) {
oms->pdata.init = of_mmc_spi_init;
oms->pdata.exit = of_mmc_spi_exit;
} else {
--
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/