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

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

drivers/gpio/gpio-rockchip.c

+1 −0
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ static int rockchip_gpio_probe(struct platform_device *pdev) 
		return -ENODEV;



	pctldev = of_pinctrl_get(pctlnp);

	of_node_put(pctlnp);

	if (!pctldev)

		return -EPROBE_DEFER;

drivers/gpio/gpio-zynqmp-modepin.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static const struct of_device_id modepin_platform_id[] = { 
	{ .compatible = "xlnx,zynqmp-gpio-modepin", },

	{ }

};

MODULE_DEVICE_TABLE(of, modepin_platform_id);



static struct platform_driver modepin_platform_driver = {

	.driver = {