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

Commit 31f984d1 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:
 "Here are two simple but wanted fixes for the i2c subsystem"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: imx: Check the return value from clk_prepare_enable()
  i2c: mux: Inherit retry count and timeout from parent for muxed bus
parents dbb022cb e5bf216a

drivers/i2c/busses/i2c-imx.c

+3 −1
Original line number Diff line number Diff line
@@ -312,7 +312,9 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx) 


	dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);



	clk_prepare_enable(i2c_imx->clk);

	result = clk_prepare_enable(i2c_imx->clk);

	if (result)

		return result;

	imx_i2c_write_reg(i2c_imx->ifdr, i2c_imx, IMX_I2C_IFDR);

	/* Enable I2C controller */

	imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);

drivers/i2c/i2c-mux.c

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, 
	priv->adap.algo = &priv->algo;

	priv->adap.algo_data = priv;

	priv->adap.dev.parent = &parent->dev;

	priv->adap.retries = parent->retries;

	priv->adap.timeout = parent->timeout;



	/* Sanity check on class */

	if (i2c_mux_parent_classes(parent) & class)