[PATCH FIXUP] pinctrl: mvebu: fixup mpp_base check

Sebastian Hesselbarth sebastian.hesselbarth at gmail.com
Wed Jun 25 06:52:16 PDT 2014


Sascha,

unfortunately, your dev_request_mem_region fixup introduced a typo
(map_base instead of mpp_base). I took the chance to also add a
corresponding check for dove's pinctrl stub.

Please squash into commmit 8d3f0c2496afe397667e35ff6b94153bcecdb6ad
 ("pinctrl: mvebu: add pinctrl drivers for Dove and Kirkwood")

Thanks!

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>
---
Cc: Sascha Hauer <s.hauer at pengutronix.de>
Cc: barebox at lists.infradead.org
---
 drivers/pinctrl/mvebu/dove.c     | 2 ++
 drivers/pinctrl/mvebu/kirkwood.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/mvebu/dove.c b/drivers/pinctrl/mvebu/dove.c
index 420b573ad1b7..bd0a632f1fd4 100644
--- a/drivers/pinctrl/mvebu/dove.c
+++ b/drivers/pinctrl/mvebu/dove.c
@@ -708,6 +708,8 @@ static int dove_pinctrl_probe(struct device_d *dev)
 
 	mpp_base = dev_request_mem_region(dev, 0);
 	mpp4_base = dev_request_mem_region(dev, 1);
+	if (!mpp_base || !mpp4_base)
+		return -EBUSY;
 
 	/*
 	 * Dove PMU does not have a stable binding, yet.
diff --git a/drivers/pinctrl/mvebu/kirkwood.c b/drivers/pinctrl/mvebu/kirkwood.c
index bde46acc0f4e..94ab10544279 100644
--- a/drivers/pinctrl/mvebu/kirkwood.c
+++ b/drivers/pinctrl/mvebu/kirkwood.c
@@ -437,7 +437,7 @@ static int kirkwood_pinctrl_probe(struct device_d *dev)
 		(struct mvebu_pinctrl_soc_info *)match->data;
 
 	mpp_base = dev_request_mem_region(dev, 0);
-	if (!map_base)
+	if (!mpp_base)
 		return -EBUSY;
 
 	return mvebu_pinctrl_probe(dev, soc);
-- 
2.0.0




More information about the barebox mailing list