projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
i2c: mux: demux-pinctrl: invalidate properly when switching fails
[linux-2.6-block.git]
/
drivers
/
i2c
/
muxes
/
i2c-demux-pinctrl.c
diff --git
a/drivers/i2c/muxes/i2c-demux-pinctrl.c
b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 215ac87f606d2d0f59bc17720ca2ec8fd60fae09..b6b9d2582fac561958fee93abe6deb93cb0142c4 100644
(file)
--- a/
drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/
drivers/i2c/muxes/i2c-demux-pinctrl.c
@@
-107,6
+107,7
@@
static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne
of_changeset_revert(&priv->chan[new_chan].chgset);
err:
dev_err(priv->dev, "failed to setup demux-adapter %d (%d)\n", new_chan, ret);
+ priv->cur_chan = -EINVAL;
return ret;
}