40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From 8341db7b05b688e8e5a93acd0e80b40be409d037 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stephen Boyd <sboyd@codeaurora.org>
|
||
|
|
Date: Thu, 6 Mar 2014 22:44:41 -0800
|
||
|
|
Subject: [PATCH 027/182] pinctrl: msm: Check for ngpios > MAX_NR_GPIO
|
||
|
|
|
||
|
|
Fail the probe and print a warning if SoC specific drivers have
|
||
|
|
more GPIOs than there can be accounted for in the static bitmaps.
|
||
|
|
This should avoid silent corruption/failures in the future.
|
||
|
|
|
||
|
|
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
|
||
|
|
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
|
||
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||
|
|
---
|
||
|
|
drivers/pinctrl/pinctrl-msm.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
|
||
|
|
index e61b30a..90ac995 100644
|
||
|
|
--- a/drivers/pinctrl/pinctrl-msm.c
|
||
|
|
+++ b/drivers/pinctrl/pinctrl-msm.c
|
||
|
|
@@ -870,10 +870,14 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
|
||
|
|
int ret;
|
||
|
|
int i;
|
||
|
|
int r;
|
||
|
|
+ unsigned ngpio = pctrl->soc->ngpios;
|
||
|
|
+
|
||
|
|
+ if (WARN_ON(ngpio > MAX_NR_GPIO))
|
||
|
|
+ return -EINVAL;
|
||
|
|
|
||
|
|
chip = &pctrl->chip;
|
||
|
|
chip->base = 0;
|
||
|
|
- chip->ngpio = pctrl->soc->ngpios;
|
||
|
|
+ chip->ngpio = ngpio;
|
||
|
|
chip->label = dev_name(pctrl->dev);
|
||
|
|
chip->dev = pctrl->dev;
|
||
|
|
chip->owner = THIS_MODULE;
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|