mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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
This commit is contained in:
commit
31f984d10c
2 changed files with 5 additions and 1 deletions
|
@ -312,7 +312,9 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx)
|
||||||
|
|
||||||
dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
|
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);
|
imx_i2c_write_reg(i2c_imx->ifdr, i2c_imx, IMX_I2C_IFDR);
|
||||||
/* Enable I2C controller */
|
/* Enable I2C controller */
|
||||||
imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
|
imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
|
||||||
|
|
|
@ -139,6 +139,8 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
|
||||||
priv->adap.algo = &priv->algo;
|
priv->adap.algo = &priv->algo;
|
||||||
priv->adap.algo_data = priv;
|
priv->adap.algo_data = priv;
|
||||||
priv->adap.dev.parent = &parent->dev;
|
priv->adap.dev.parent = &parent->dev;
|
||||||
|
priv->adap.retries = parent->retries;
|
||||||
|
priv->adap.timeout = parent->timeout;
|
||||||
|
|
||||||
/* Sanity check on class */
|
/* Sanity check on class */
|
||||||
if (i2c_mux_parent_classes(parent) & class)
|
if (i2c_mux_parent_classes(parent) & class)
|
||||||
|
|
Loading…
Reference in a new issue