diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2020-05-06 21:21:00 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2020-05-15 11:23:49 +0200 |
| commit | e9d1a0a41d4486955e96552293c1fcf1fce61602 (patch) | |
| tree | 05083274f6c151301eba80116dbca164958326fa /drivers/i2c | |
| parent | i2c: altera: Fix race between xfer_msg and isr thread (diff) | |
| download | linux-e9d1a0a41d4486955e96552293c1fcf1fce61602.tar.xz linux-e9d1a0a41d4486955e96552293c1fcf1fce61602.zip | |
i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
A call to 'i2c_demux_deactivate_master()' is missing in the error handling
path, as already done in the remove function.
Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c index 0e16490eb3a1..5365199a31f4 100644 --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c @@ -272,6 +272,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) err_rollback_available: device_remove_file(&pdev->dev, &dev_attr_available_masters); err_rollback: + i2c_demux_deactivate_master(priv); for (j = 0; j < i; j++) { of_node_put(priv->chan[j].parent_np); of_changeset_destroy(&priv->chan[j].chgset); |