Commit e409a6a3 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: turn recovery error on init to debug 



In some configurations, recovery is optional. So, don't throw an error
when it is not used because e.g. pinctrl settings for recovery are not
provided. Reword the message and make it debug output.

Reported-by: default avatarKlaus Kudielka <klaus.kudielka@gmail.com>
Tested-by: default avatarKlaus Kudielka <klaus.kudielka@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Cc: stable@kernel.org
parent 1e28eed1

drivers/i2c/i2c-core-base.c

+4 −3
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int i2c_gpio_init_recovery(struct i2c_adapter *adap) 
static int i2c_init_recovery(struct i2c_adapter *adap)

{

	struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;

	char *err_str;

	char *err_str, *err_level = KERN_ERR;



	if (!bri)

		return 0;
@@ -387,7 +387,8 @@ static int i2c_init_recovery(struct i2c_adapter *adap) 
		return -EPROBE_DEFER;



	if (!bri->recover_bus) {

		err_str = "no recover_bus() found";

		err_str = "no suitable method provided";

		err_level = KERN_DEBUG;

		goto err;

	}
@@ -414,7 +415,7 @@ static int i2c_init_recovery(struct i2c_adapter *adap) 


	return 0;

 err:

	dev_err(&adap->dev, "Not using recovery: %s\n", err_str);

	dev_printk(err_level, &adap->dev, "Not using recovery: %s\n", err_str);

	adap->bus_recovery_info = NULL;



	return -EINVAL;