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

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

i2c: mux: demux-pinctrl: properly roll back when adding adapter fails 



We also need to revert the dynamic OF change, so we get a consistent
state again. Otherwise, we might have two devices enabled e.g. after
pinctrl setup fails.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
parent 29b4817d

drivers/i2c/muxes/i2c-demux-pinctrl.c

+3 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne 
	adap = of_find_i2c_adapter_by_node(priv->chan[new_chan].parent_np);

	if (!adap) {

		ret = -ENODEV;

		goto err;

		goto err_with_revert;

	}



	p = devm_pinctrl_get_select(adap->dev.parent, priv->bus_name);
@@ -103,6 +103,8 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne 


 err_with_put:

	i2c_put_adapter(adap);

 err_with_revert:

	of_changeset_revert(&priv->chan[new_chan].chgset);

 err:

	dev_err(priv->dev, "failed to setup demux-adapter %d (%d)\n", new_chan, ret);

	return ret;