Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-1
+3
-1
drivers/i2c/busses/i2c-imx.c
+3
-1
drivers/i2c/busses/i2c-imx.c
···
312
312
313
313
dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
314
314
315
-
clk_prepare_enable(i2c_imx->clk);
315
+
result = clk_prepare_enable(i2c_imx->clk);
316
+
if (result)
317
+
return result;
316
318
imx_i2c_write_reg(i2c_imx->ifdr, i2c_imx, IMX_I2C_IFDR);
317
319
/* Enable I2C controller */
318
320
imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
+2
drivers/i2c/i2c-mux.c
+2
drivers/i2c/i2c-mux.c
···
139
139
priv->adap.algo = &priv->algo;
140
140
priv->adap.algo_data = priv;
141
141
priv->adap.dev.parent = &parent->dev;
142
+
priv->adap.retries = parent->retries;
143
+
priv->adap.timeout = parent->timeout;
142
144
143
145
/* Sanity check on class */
144
146
if (i2c_mux_parent_classes(parent) & class)