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

Commit 1c7b252a authored by Peter Rosin's avatar Peter Rosin Committed by Greg Kroah-Hartman
Browse files

i2c: mux: demux-pinctrl: do not deactivate a master that is not active 



[ Upstream commit 1a22aabf20adf89cb216f566913196128766f25b ]

Attempting to rollback the activation of the current master when
the current master has not been activated is bad. priv->cur_chan
and priv->cur_adap are both still zeroed out and the rollback
may result in attempts to revert an of changeset that has not been
applied and do result in calls to both del and put the zeroed out
i2c_adapter. Maybe it crashes, or whatever, but it's bad in any
case.

Fixes: e9d1a0a41d44 ("i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'")
Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 41249fff

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

+3 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) 


	err = device_create_file(&pdev->dev, &dev_attr_available_masters);

	if (err)

		goto err_rollback;

		goto err_rollback_activation;



	err = device_create_file(&pdev->dev, &dev_attr_current_master);

	if (err)
@@ -271,8 +271,9 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) 


err_rollback_available:

	device_remove_file(&pdev->dev, &dev_attr_available_masters);

err_rollback:

err_rollback_activation:

	i2c_demux_deactivate_master(priv);

err_rollback:

	for (j = 0; j < i; j++) {

		of_node_put(priv->chan[j].parent_np);

		of_changeset_destroy(&priv->chan[j].chgset);