Commit 0de82f0d authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 2125a725 a5135526
...@@ -713,6 +713,7 @@ static int rockchip_gpio_probe(struct platform_device *pdev) ...@@ -713,6 +713,7 @@ static int rockchip_gpio_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
pctldev = of_pinctrl_get(pctlnp); pctldev = of_pinctrl_get(pctlnp);
of_node_put(pctlnp);
if (!pctldev) if (!pctldev)
return -EPROBE_DEFER; return -EPROBE_DEFER;
......
...@@ -146,6 +146,7 @@ static const struct of_device_id modepin_platform_id[] = { ...@@ -146,6 +146,7 @@ static const struct of_device_id modepin_platform_id[] = {
{ .compatible = "xlnx,zynqmp-gpio-modepin", }, { .compatible = "xlnx,zynqmp-gpio-modepin", },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, modepin_platform_id);
static struct platform_driver modepin_platform_driver = { static struct platform_driver modepin_platform_driver = {
.driver = { .driver = {
......
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