diff options
| author | Peter Rosin <peda@axentia.se> | 2022-03-02 12:22:35 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-03-20 00:49:43 +0100 |
| commit | 1a22aabf20adf89cb216f566913196128766f25b (patch) | |
| tree | bed053014957e87778486e4e5dc3f5e7ccb66f81 /drivers/i2c/muxes | |
| parent | cb13aa16f34f794a9cee2626862af8a95f0f0ee9 (diff) | |
| download | linux-starfive-1a22aabf20adf89cb216f566913196128766f25b.tar.gz linux-starfive-1a22aabf20adf89cb216f566913196128766f25b.tar.bz2 linux-starfive-1a22aabf20adf89cb216f566913196128766f25b.zip | |
i2c: mux: demux-pinctrl: do not deactivate a master that is not active
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: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c/muxes')
| -rw-r--r-- | drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c index 5365199a31f4..f7a7405d4350 100644 --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c @@ -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); |