Skip to content

Commit 547fc32

Browse files
committed
Merge tag 'gpio-fixes-for-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: - fix clock handle leak in probe() error path in gpio-aspeed - add a dummy register read to ensure the write actually completed * tag 'gpio-fixes-for-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: aspeed: Use devm_clk api to manage clock source gpio: aspeed: Add the flush write to ensure the write complete.
2 parents 6254d53 + a6191a3 commit 547fc32

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/gpio/gpio-aspeed.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,8 @@ static void __aspeed_gpio_set(struct gpio_chip *gc, unsigned int offset,
406406
gpio->dcache[GPIO_BANK(offset)] = reg;
407407

408408
iowrite32(reg, addr);
409+
/* Flush write */
410+
ioread32(addr);
409411
}
410412

411413
static void aspeed_gpio_set(struct gpio_chip *gc, unsigned int offset,
@@ -1191,7 +1193,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
11911193
if (!gpio_id)
11921194
return -EINVAL;
11931195

1194-
gpio->clk = of_clk_get(pdev->dev.of_node, 0);
1196+
gpio->clk = devm_clk_get_enabled(&pdev->dev, NULL);
11951197
if (IS_ERR(gpio->clk)) {
11961198
dev_warn(&pdev->dev,
11971199
"Failed to get clock from devicetree, debouncing disabled\n");

0 commit comments

Comments
 (0)