aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-06 08:56:09 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2016-09-26 15:31:25 -0400
commit902a8a0b50d7d13cf88211d0bde3a7c27fd98fa5 (patch)
tree2da4826b9b601c64fd1c48c8dfee3f5bc3abefbe /drivers/mmc
parent7428e0bf7e87627af880b013f5f4648f07f70842 (diff)
mmc: davinci: remove incorrect NO_IRQ use
platform_get_irq() returns an error value on failure, not NO_IRQ, so the error handling here could never work. This changes the code to propagate the error value instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/davinci_mmc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index a56373c75983..8fa478c3b0db 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -1216,9 +1216,11 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
1216 } 1216 }
1217 1217
1218 r = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1218 r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1219 irq = platform_get_irq(pdev, 0); 1219 if (!r)
1220 if (!r || irq == NO_IRQ)
1221 return -ENODEV; 1220 return -ENODEV;
1221 irq = platform_get_irq(pdev, 0);
1222 if (irq < 0)
1223 return irq;
1222 1224
1223 mem_size = resource_size(r); 1225 mem_size = resource_size(r);
1224 mem = devm_request_mem_region(&pdev->dev, r->start, mem_size, 1226 mem = devm_request_mem_region(&pdev->dev, r->start, mem_size,