Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a86f944 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "Four driver bugfixes for the I2C subsystem"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mux: reg: wrong condition checked for of_address_to_resource return value
  i2c: tegra: Correct error path in probe
  i2c: remove __init from i2c_register_board_info()
  i2c: qup: Fix wrong value of index variable
parents 1f027f69 22ebf00e

drivers/i2c/busses/i2c-qup.c

+2 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,8 @@ static int qup_i2c_xfer_v2(struct i2c_adapter *adap, 
		}

	}



	idx = 0;



	do {

		if (msgs[idx].len == 0) {

			ret = -EINVAL;

drivers/i2c/busses/i2c-tegra.c

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ static int tegra_i2c_probe(struct platform_device *pdev) 
	ret = tegra_i2c_init(i2c_dev);

	if (ret) {

		dev_err(&pdev->dev, "Failed to initialize i2c controller");

		goto unprepare_div_clk;

		goto disable_div_clk;

	}



	ret = devm_request_irq(&pdev->dev, i2c_dev->irq,

drivers/i2c/i2c-boardinfo.c

+1 −3
Original line number Diff line number Diff line
@@ -56,9 +56,7 @@ EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num); 
 * The board info passed can safely be __initdata, but be careful of embedded

 * pointers (for platform_data, functions, etc) since that won't be copied.

 */

int __init

i2c_register_board_info(int busnum,

	struct i2c_board_info const *info, unsigned len)

int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len)

{

	int status;

drivers/i2c/muxes/i2c-mux-reg.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int i2c_mux_reg_probe_dt(struct regmux *mux, 
		mux->data.idle_in_use = true;



	/* map address from "reg" if exists */

	if (of_address_to_resource(np, 0, &res)) {

	if (of_address_to_resource(np, 0, &res) == 0) {

		mux->data.reg_size = resource_size(&res);

		mux->data.reg = devm_ioremap_resource(&pdev->dev, &res);

		if (IS_ERR(mux->data.reg))