i2c: i2c-mxs: Check the return value from stmp_reset_block()
Subsystems (2)
PATCH 1/1 i2c: i2c-mxs: Check the return value from stmp_reset_block()
From: Fabio Estevam <[email protected]>
stmp_reset_block() may fail, so let's check its return value and propagate it in the case of error.
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/i2c/busses/i2c-mxs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-mxs.c +9 -3
@@ -123,9 +123,11 @@ struct mxs_i2c_dev {bool dma_read; }; -static void mxs_i2c_reset (struct mxs_i2c_dev *i2c) +static int mxs_i2c_reset (struct mxs_i2c_dev *i2c) { -stmp_reset_block (i2c->regs); +int ret =stmp_reset_block (i2c->regs); +if (ret) +return ret;/* * Configure timing for the I2C block. The I2C TIMING2 register has to
@@ -139,6 +141,8 @@ static void mxs_i2c_reset(struct mxs_i2c_dev *i2c)writel (0x00300030 , i2c->regs +MXS_I2C_TIMING2 );writel (MXS_I2C_IRQ_MASK <<8 , i2c->regs +MXS_I2C_CTRL1_SET ); + +return 0 ; }static void mxs_i2c_dma_finish (struct mxs_i2c_dev *i2c)
@@ -683,7 +687,9 @@ static int mxs_i2c_probe(struct platform_device *pdev)platform_set_drvdata (pdev, i2c);/* Do reset to enforce correct startup after pinmuxing */ -mxs_i2c_reset (i2c); + err =mxs_i2c_reset (i2c); +if (err) +return err; adap = &i2c->adapter;strlcpy (adap->name,"MXS I2C adapter" ,sizeof (adap->name));
Signature · 1 line
1.8.1.2
Dear Fabio Estevam,
Quoted 6 lines
From: Fabio Estevam <[email protected]>
stmp_reset_block()may fail, so let's check its return value and propagate it in the case of error.Signed-off-by Fabio Estevam <[email protected]>
Be careful that the mxs_i2c_reset() is called from multiple places in the driver. You should handle all of the calls.
Best regards,
Marek Vasut