From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Nov 2023 18:41:14 +0000 (-1000)
Subject: Merge tag 'i2c-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3d05e493e461c4469a9b73e00e59ea16e1d8a416;p=linux.git

Merge tag 'i2c-for-6.7-rc1' of git://git./linux/kernel/git/wsa/linux

Pull i2c updates from Wolfram Sang:
 "I2C has largely driver updates for 6.7, i.e. feature additions (like
  adding transfers while in atomic mode), using new helpers (like
  devm_clk_get_enabled), new IDs, documentation fixes and additions...
  you name it.

  The core got a memleak fix and better support for nested muxes"

* tag 'i2c-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (53 commits)
  i2c: s3c2410: make i2c_s3c_irq_nextbyte() void
  i2c: qcom-geni: add ACPI device id for sc8180x
  Documentation: i2c: add fault code for not supporting 10 bit addresses
  i2c: sun6i-p2wi: Prevent potential division by zero
  i2c: mux: demux-pinctrl: Convert to use sysfs_emit_at() API
  i2c: i801: Use new helper acpi_use_parent_companion
  ACPI: Add helper acpi_use_parent_companion
  MAINTAINERS: add YAML file for i2c-demux-pinctrl
  i2c: core: fix lockdep warning for sparsely nested adapter chain
  i2c: axxia: eliminate kernel-doc warnings
  dt-bindings: i2c: i2c-demux-pinctrl: Convert to json-schema
  i2c: stm32f7: Use devm_clk_get_enabled()
  i2c: stm32f4: Use devm_clk_get_enabled()
  i2c: stm32f7: add description of atomic in struct stm32f7_i2c_dev
  i2c: fix memleak in i2c_new_client_device()
  i2c: exynos5: Calculate t_scl_l, t_scl_h according to i2c spec
  i2c: i801: Simplify class-based client device instantiation
  i2c: exynos5: add support for atomic transfers
  i2c: at91-core: Use devm_clk_get_enabled()
  eeprom: at24: add ST M24C64-D Additional Write lockable page support
  ...
---

3d05e493e461c4469a9b73e00e59ea16e1d8a416
diff --cc drivers/i2c/muxes/i2c-mux-gpio.c
index 78987ead6be06,43b24286da93b..6b979a0a6ab86
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@@ -101,13 -102,10 +101,12 @@@ static int i2c_mux_gpio_probe_fw(struc
  	device_for_each_child_node(dev, child) {
  		if (is_of_node(child)) {
  			fwnode_property_read_u32(child, "reg", values + i);
- 
  		} else if (is_acpi_node(child)) {
  			rc = acpi_get_local_address(ACPI_HANDLE_FWNODE(child), values + i);
 -			if (rc)
 +			if (rc) {
 +				fwnode_handle_put(child);
  				return dev_err_probe(dev, rc, "Cannot get address\n");
 +			}
  		}
  
  		i++;