linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mmc: Fix EINVAL if an mmc_spi controller has no IRQ
@ 2012-05-25 17:00 Chris Boot
  0 siblings, 0 replies; only message in thread
From: Chris Boot @ 2012-05-25 17:00 UTC (permalink / raw)
  To: linux-mmc; +Cc: linux-kernel, Chris Boot

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@bootc.net>
---
 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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-05-25 17:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-25 17:00 [PATCH] mmc: Fix EINVAL if an mmc_spi controller has no IRQ Chris Boot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).