]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
gpio/aspeed: Fix incorrect number of banks
authorRashmica Gupta <rashmica.g@gmail.com>
Fri, 6 Sep 2019 06:26:22 +0000 (16:26 +1000)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 11 Sep 2019 10:04:55 +0000 (11:04 +0100)
The current calculation for the number of GPIO banks is only correct if
the number of GPIOs is a multiple of 32 (if there were 31 GPIOs we would
currently say there are 0 banks, which is incorrect).

Fixes: 361b79119a4b7 ('gpio: Add Aspeed driver')
Signed-off-by: Rashmica Gupta <rashmica.g@gmail.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Link: https://lore.kernel.org/r/20190906062623.13354-1-rashmica.g@gmail.com
Reviewed-by: Joel Stanley <joel@jms.d.au>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-aspeed.c

index 7bcd83dbc3e340b086e08604104805e4422b34b3..854ed3bc66a78222173bc7c866c9b1da0606f372 100644 (file)
@@ -1168,7 +1168,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
        gpio->chip.base = -1;
 
        /* Allocate a cache of the output registers */
-       banks = gpio->config->nr_gpios >> 5;
+       banks = DIV_ROUND_UP(gpio->config->nr_gpios, 32);
        gpio->dcache = devm_kcalloc(&pdev->dev,
                                    banks, sizeof(u32), GFP_KERNEL);
        if (!gpio->dcache)