lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] mmc: pxamci: fix the device-tree probe deferral path
Date
When the gpio driver is probed after the mmc one, the read/write gpio
and card detection one return -EPROBE_DEFER. Unfortunately, the memory
region remains requested, and upon the next probe, the probe will fail
anyway with -EBUSY.

Fix this by releasing the memory resource upon probe failure.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
drivers/mmc/host/pxamci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 28a057fae0a1..405ec339a1b8 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -657,7 +657,7 @@ static int pxamci_probe(struct platform_device *pdev)
if (!r || irq < 0)
return -ENXIO;

- r = request_mem_region(r->start, SZ_4K, DRIVER_NAME);
+ r = devm_request_mem_region(&pdev->dev, r->start, SZ_4K, DRIVER_NAME);
if (!r)
return -EBUSY;

@@ -840,7 +840,6 @@ out:
}
if (mmc)
mmc_free_host(mmc);
- release_resource(r);
return ret;
}

--
2.1.4
\
 
 \ /
  Last update: 2016-02-04 00:01    [W:0.054 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site