diff options
| author | Axel Lin <axel.lin@ingics.com> | 2016-02-20 09:48:07 +0800 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-25 15:20:43 +0100 |
| commit | f0d3c72ccb3224fa70cbdb7998b1263d739b1b3c (patch) | |
| tree | d69f40023e03d75de59f5b1e9ecd0a8b4ebd1954 /drivers/gpio/gpio-ath79.c | |
| parent | 40c8eabac43db862810367edb2fe9ec7f69e814e (diff) | |
| download | blackbird-op-linux-f0d3c72ccb3224fa70cbdb7998b1263d739b1b3c.tar.gz blackbird-op-linux-f0d3c72ccb3224fa70cbdb7998b1263d739b1b3c.zip | |
gpio: ath79: Check valid gpio count for both DT and non-DT cases
Move the code checking valid gpio count to cover both DT and non-DT cases.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Alban Bedel <albeu@free.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-ath79.c')
| -rw-r--r-- | drivers/gpio/gpio-ath79.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c index 018ea9d33b54..c4f4cddc7c1a 100644 --- a/drivers/gpio/gpio-ath79.c +++ b/drivers/gpio/gpio-ath79.c @@ -240,10 +240,6 @@ static int ath79_gpio_probe(struct platform_device *pdev) dev_err(&pdev->dev, "ngpios property is not valid\n"); return err; } - if (ath79_gpio_count >= 32) { - dev_err(&pdev->dev, "ngpios must be less than 32\n"); - return -EINVAL; - } oe_inverted = of_device_is_compatible(np, "qca,ar9340-gpio"); } else if (pdata) { ath79_gpio_count = pdata->ngpios; @@ -253,6 +249,11 @@ static int ath79_gpio_probe(struct platform_device *pdev) return -EINVAL; } + if (ath79_gpio_count >= 32) { + dev_err(&pdev->dev, "ngpios must be less than 32\n"); + return -EINVAL; + } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ctrl->base = devm_ioremap_nocache( &pdev->dev, res->start, resource_size(res)); |
