diff options
| author | Stephen Boyd | 2014-03-07 07:44:41 +0100 |
|---|---|---|
| committer | Linus Walleij | 2014-03-12 15:12:27 +0100 |
| commit | dcd278b8604e5c37c61853eb09134cbfea03b7de (patch) | |
| tree | d54071ad856f50e8e9c7fa7ff12b2a8cbb8af0ea /drivers/pinctrl/pinctrl-msm.c | |
| parent | pinctrl: msm: Silence recursive lockdep warning (diff) | |
| download | kernel-qcow2-linux-dcd278b8604e5c37c61853eb09134cbfea03b7de.tar.gz kernel-qcow2-linux-dcd278b8604e5c37c61853eb09134cbfea03b7de.tar.xz kernel-qcow2-linux-dcd278b8604e5c37c61853eb09134cbfea03b7de.zip | |
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>
Diffstat (limited to 'drivers/pinctrl/pinctrl-msm.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-msm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c index 2df3a48974f3..e563bbc5cefc 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c @@ -897,10 +897,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; |