From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Jun 2018 07:21:46 +0000 (+0900)
Subject: Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... 
X-Git-Tag: v5.15~8605
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bca19a01d50143b736f0f59eb3ccc05b1106172;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'i2c/for-4.18' of git://git./linux/kernel/git/wsa/linux

Pull i2c updates from Wolfram Sang:

 - mainly feature additions to drivers (stm32f7, qup, xlp9xx, mlxcpld, ...)

 - conversion to use the i2c_8bit_addr_from_msg macro consistently

 - move includes to platform_data

 - core updates to allow the (still in review) I3C subsystem to connect

 - and the regular share of smaller driver updates

* 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (68 commits)
  i2c: qup: fix building without CONFIG_ACPI
  i2c: tegra: Remove suspend-resume
  i2c: imx-lpi2c: Switch to SPDX identifier
  i2c: mxs: Switch to SPDX identifier
  i2c: busses: make use of i2c_8bit_addr_from_msg
  i2c: algos: make use of i2c_8bit_addr_from_msg
  i2c: rcar: document R8A77980 bindings
  i2c: qup: Add command-line parameter to override SCL frequency
  i2c: qup: Correct duty cycle for FM and FM+
  i2c: qup: Add support for Fast Mode Plus
  i2c: qup: add probe path for Centriq ACPI devices
  i2c: robotfuzz-osif: drop pointless test
  i2c: robotfuzz-osif: remove pointless local variable
  i2c: rk3x: Don't print visible virtual mapping MMIO address
  i2c: opal: don't check number of messages in the driver
  i2c: ibm_iic: don't check number of messages in the driver
  i2c: imx: Switch to SPDX identifier
  i2c: mux: pca954x: merge calls to of_match_device and of_device_get_match_data
  i2c: mux: demux-pinctrl: use proper parent device for demux adapter
  i2c: mux: improve error message for failed symlink
  ...
---

9bca19a01d50143b736f0f59eb3ccc05b1106172
diff --cc drivers/i2c/muxes/i2c-mux-reg.c
index f583f80,f624ed6..5653295
--- a/drivers/i2c/muxes/i2c-mux-reg.c
+++ b/drivers/i2c/muxes/i2c-mux-reg.c
@@@ -124,13 -124,11 +124,11 @@@ static int i2c_mux_reg_probe_dt(struct 
  	}
  	mux->data.write_only = of_property_read_bool(np, "write-only");
  
 -	values = devm_kzalloc(&pdev->dev,
 -			      sizeof(*mux->data.values) * mux->data.n_values,
 +	values = devm_kcalloc(&pdev->dev,
 +			      mux->data.n_values, sizeof(*mux->data.values),
  			      GFP_KERNEL);
- 	if (!values) {
- 		dev_err(&pdev->dev, "Cannot allocate values array");
+ 	if (!values)
  		return -ENOMEM;
- 	}
  
  	for_each_child_of_node(np, child) {
  		of_property_read_u32(child, "reg", values + i);