mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: barebox@lists.infradead.org
Subject: [PATCH FIXUP] pinctrl: mvebu: fixup mpp_base check
Date: Wed, 25 Jun 2014 15:52:16 +0200	[thread overview]
Message-ID: <1403704336-9314-1-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <20140625065615.GM15686@pengutronix.de>

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@gmail.com>
---
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-06-25 13:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-24 10:43 [PATCH v2] pinctrl: mvebu: add pinctrl drivers for Dove and Kirkwood Sebastian Hesselbarth
2014-06-25  6:56 ` Sascha Hauer
2014-06-25  7:35   ` Sebastian Hesselbarth
2014-06-25 12:40   ` Alexander Aring
2014-06-26  5:56     ` Sascha Hauer
2014-06-26 14:38       ` Alexander Aring
2014-06-26 19:01         ` Sascha Hauer
2014-06-25 13:52   ` Sebastian Hesselbarth [this message]
2014-06-26  5:58     ` [PATCH FIXUP] pinctrl: mvebu: fixup mpp_base check Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403704336-9314-1-git-send-email-sebastian.hesselbarth@gmail.com \
    --to=sebastian.hesselbarth@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox