Commit dd4f5037 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:
 "Mostly error path fixes, but one pretty serious interrupt problem in
  the Ocelot driver as well:

   - Fix two error paths and a missing semicolon in the Intel driver

   - Add a missing ACPI ID for the Intel Panther Lake

   - Check return value of devm_kasprintf() in the Apple and STM32
     drivers

   - Add a missing mutex_destroy() in the aw9523 driver

   - Fix a double free in cv1800_pctrl_dt_node_to_map() in the Sophgo
     driver

   - Fix a double free in ma35_pinctrl_dt_node_to_map_func() in the
     Nuvoton driver

   - Fix a bug in the Ocelot interrupt handler making the system hang"

* tag 'pinctrl-v6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: ocelot: fix system hang on level based interrupts
  pinctrl: nuvoton: fix a double free in ma35_pinctrl_dt_node_to_map_func()
  pinctrl: sophgo: fix double free in cv1800_pctrl_dt_node_to_map()
  pinctrl: intel: platform: Add Panther Lake to the list of supported
  pinctrl: aw9523: add missing mutex_destroy
  pinctrl: stm32: check devm_kasprintf() returned value
  pinctrl: apple: check devm_kasprintf() returned value
  pinctrl: intel: platform: use semicolon instead of comma in ncommunities assignment
  pinctrl: intel: platform: fix error path in device_for_each_child_node()
parents c5522822 93b8ddc5

drivers/pinctrl/intel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ config PINCTRL_INTEL_PLATFORM 
	  of Intel PCH pins and using them as GPIOs. Currently the following

	  Intel SoCs / platforms require this to be functional:

	  - Lunar Lake

	  - Panther Lake



config PINCTRL_ALDERLAKE

	tristate "Intel Alder Lake pinctrl and GPIO driver"

drivers/pinctrl/intel/pinctrl-intel-platform.c

+2 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static int intel_platform_pinctrl_prepare_community(struct device *dev, 
						    struct intel_community *community,

						    struct intel_platform_pins *pins)

{

	struct fwnode_handle *child;

	struct intel_padgroup *gpps;

	unsigned int group;

	size_t ngpps;
@@ -131,7 +130,7 @@ static int intel_platform_pinctrl_prepare_community(struct device *dev, 
		return -ENOMEM;



	group = 0;

	device_for_each_child_node(dev, child) {

	device_for_each_child_node_scoped(dev, child) {

		struct intel_padgroup *gpp = &gpps[group];



		gpp->reg_num = group;
@@ -159,7 +158,7 @@ static int intel_platform_pinctrl_prepare_soc_data(struct device *dev, 
	int ret;



	/* Version 1.0 of the specification assumes only a single community per device node */

	ncommunities = 1,

	ncommunities = 1;

	communities = devm_kcalloc(dev, ncommunities, sizeof(*communities), GFP_KERNEL);

	if (!communities)

		return -ENOMEM;

drivers/pinctrl/nuvoton/pinctrl-ma35.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int ma35_pinctrl_dt_node_to_map_func(struct pinctrl_dev *pctldev, 
	}



	map_num += grp->npins;

	new_map = devm_kcalloc(pctldev->dev, map_num, sizeof(*new_map), GFP_KERNEL);

	new_map = kcalloc(map_num, sizeof(*new_map), GFP_KERNEL);

	if (!new_map)

		return -ENOMEM;

drivers/pinctrl/pinctrl-apple-gpio.c

+3 −0
Original line number Diff line number Diff line
@@ -474,6 +474,9 @@ static int apple_gpio_pinctrl_probe(struct platform_device *pdev) 
	for (i = 0; i < npins; i++) {

		pins[i].number = i;

		pins[i].name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "PIN%u", i);

		if (!pins[i].name)

			return -ENOMEM;



		pins[i].drv_data = pctl;

		pin_names[i] = pins[i].name;

		pin_nums[i] = i;

drivers/pinctrl/pinctrl-aw9523.c

+4 −2
Original line number Diff line number Diff line
@@ -987,8 +987,10 @@ static int aw9523_probe(struct i2c_client *client) 
	lockdep_set_subclass(&awi->i2c_lock, i2c_adapter_depth(client->adapter));



	pdesc = devm_kzalloc(dev, sizeof(*pdesc), GFP_KERNEL);

	if (!pdesc)

		return -ENOMEM;

	if (!pdesc) {

		ret = -ENOMEM;

		goto err_disable_vregs;

	}



	ret = aw9523_hw_init(awi);

	if (ret)