Browse Source

mmc: mxcmmc: fix error return code in mxcmci_probe()

platform_get_irq() returns an error code, but the mxcmmc driver
ignores it and always returns -EINVAL. This is not correct,
and prevents -EPROBE_DEFER from being propagated properly.

Print error message and propagate the return value of
platform_get_irq on failure.

Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Gustavo A. R. Silva 8 years ago
parent
commit
f216c124dc
1 changed files with 4 additions and 2 deletions
  1. 4 2
      drivers/mmc/host/mxcmmc.c

+ 4 - 2
drivers/mmc/host/mxcmmc.c

@@ -1014,8 +1014,10 @@ static int mxcmci_probe(struct platform_device *pdev)
 
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	irq = platform_get_irq(pdev, 0);
 	irq = platform_get_irq(pdev, 0);
-	if (irq < 0)
-		return -EINVAL;
+	if (irq < 0) {
+		dev_err(&pdev->dev, "failed to get IRQ: %d\n", irq);
+		return irq;
+	}
 
 
 	mmc = mmc_alloc_host(sizeof(*host), &pdev->dev);
 	mmc = mmc_alloc_host(sizeof(*host), &pdev->dev);
 	if (!mmc)
 	if (!mmc)