Skip to content

Commit 0de82f0

Browse files
committed
Merge tag 'gpio-fixes-for-v6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: - fix an OF node reference leak in gpio-rockchip - add the missing module device table to gpio-modepin * tag 'gpio-fixes-for-v6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: modepin: Enable module autoloading gpio: rockchip: fix OF node leak in probe()
2 parents 2125a72 + a513552 commit 0de82f0

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

drivers/gpio/gpio-rockchip.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ static int rockchip_gpio_probe(struct platform_device *pdev)
713713
return -ENODEV;
714714

715715
pctldev = of_pinctrl_get(pctlnp);
716+
of_node_put(pctlnp);
716717
if (!pctldev)
717718
return -EPROBE_DEFER;
718719

drivers/gpio/gpio-zynqmp-modepin.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ static const struct of_device_id modepin_platform_id[] = {
146146
{ .compatible = "xlnx,zynqmp-gpio-modepin", },
147147
{ }
148148
};
149+
MODULE_DEVICE_TABLE(of, modepin_platform_id);
149150

150151
static struct platform_driver modepin_platform_driver = {
151152
.driver = {

0 commit comments

Comments
 (0)