From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wzncx-0008GV-L9 for barebox@lists.infradead.org; Wed, 25 Jun 2014 13:52:47 +0000 Received: by mail-we0-f178.google.com with SMTP id x48so2049769wes.37 for ; Wed, 25 Jun 2014 06:52:19 -0700 (PDT) From: Sebastian Hesselbarth Date: Wed, 25 Jun 2014 15:52:16 +0200 Message-Id: <1403704336-9314-1-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <20140625065615.GM15686@pengutronix.de> References: <20140625065615.GM15686@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH FIXUP] pinctrl: mvebu: fixup mpp_base check To: Sebastian Hesselbarth Cc: barebox@lists.infradead.org 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 --- Cc: Sascha Hauer 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