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

Commit ad28edcb authored by Wolfram Sang's avatar Wolfram Sang Committed by Lee Jones
Browse files

mfd: max77693: Convert to i2c_new_dummy_device 



Move from i2c_new_dummy() to i2c_new_dummy_device(), so we now get an
ERRPTR which we use in error handling.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent f6ae8129

drivers/mfd/max77693.c

+6 −6
Original line number Diff line number Diff line
@@ -183,17 +183,17 @@ static int max77693_i2c_probe(struct i2c_client *i2c, 
	} else

		dev_info(max77693->dev, "device ID: 0x%x\n", reg_data);



	max77693->i2c_muic = i2c_new_dummy(i2c->adapter, I2C_ADDR_MUIC);

	if (!max77693->i2c_muic) {

	max77693->i2c_muic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_MUIC);

	if (IS_ERR(max77693->i2c_muic)) {

		dev_err(max77693->dev, "Failed to allocate I2C device for MUIC\n");

		return -ENODEV;

		return PTR_ERR(max77693->i2c_muic);

	}

	i2c_set_clientdata(max77693->i2c_muic, max77693);



	max77693->i2c_haptic = i2c_new_dummy(i2c->adapter, I2C_ADDR_HAPTIC);

	if (!max77693->i2c_haptic) {

	max77693->i2c_haptic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_HAPTIC);

	if (IS_ERR(max77693->i2c_haptic)) {

		dev_err(max77693->dev, "Failed to allocate I2C device for Haptic\n");

		ret = -ENODEV;

		ret = PTR_ERR(max77693->i2c_haptic);

		goto err_i2c_haptic;

	}

	i2c_set_clientdata(max77693->i2c_haptic, max77693);