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

Commit a5f65018 authored by Gao Pan's avatar Gao Pan Committed by Wolfram Sang
Browse files

i2c: imx: init bus recovery info before adding i2c adapter 



During driver probe, i2c_imx_init_recovery_info() must come before
i2c_add_numbered_adapter(), because the get/set_scl() functions
are assigned in i2c_register_adapter() under the conditon that bus
recover_info are initialized. Otherwise, get/set_scl() function
pointers never get assigned.

In such case, when i2c_generic_gpio_recovery() is used for bus recovery,
there will be kernel crash because bri->set_scl is NULL.

The solution to this bug is moving i2c_imx_init_recovery_info() before
i2c_register_adapter().

Signed-off-by: default avatarGao Pan <b54642@freescale.com>
Signed-off-by: default avatarFugang Duan <B38611@freescale.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
parent 7ee24eb5

drivers/i2c/busses/i2c-imx.c

+2 −2
Original line number Diff line number Diff line
@@ -1119,6 +1119,8 @@ static int i2c_imx_probe(struct platform_device *pdev) 
			i2c_imx, IMX_I2C_I2CR);

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



	i2c_imx_init_recovery_info(i2c_imx, pdev);



	/* Add I2C adapter */

	ret = i2c_add_numbered_adapter(&i2c_imx->adapter);

	if (ret < 0) {
@@ -1126,8 +1128,6 @@ static int i2c_imx_probe(struct platform_device *pdev) 
		goto clk_disable;

	}



	i2c_imx_init_recovery_info(i2c_imx, pdev);



	/* Set up platform driver data */

	platform_set_drvdata(pdev, i2c_imx);

	clk_disable_unprepare(i2c_imx->clk);