Commit 5207c6d7 authored by Rashmica Gupta's avatar Rashmica Gupta Committed by Greg Kroah-Hartman

gpio/aspeed: Fix incorrect number of banks

[ Upstream commit 3c4710ae ]

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: 361b7911 ('gpio: Add Aspeed driver')
Signed-off-by: default avatarRashmica Gupta <rashmica.g@gmail.com>
Reviewed-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Link: https://lore.kernel.org/r/20190906062623.13354-1-rashmica.g@gmail.comReviewed-by: default avatarJoel Stanley <joel@jms.d.au>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9de3a3a7
...@@ -1199,7 +1199,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) ...@@ -1199,7 +1199,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
gpio->chip.irq.need_valid_mask = true; gpio->chip.irq.need_valid_mask = true;
/* Allocate a cache of the output registers */ /* 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, gpio->dcache = devm_kcalloc(&pdev->dev,
banks, sizeof(u32), GFP_KERNEL); banks, sizeof(u32), GFP_KERNEL);
if (!gpio->dcache) if (!gpio->dcache)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment