mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux into i2c/for-current
This commit is contained in:
commit
e61dfc836b
1 changed files with 2 additions and 0 deletions
|
@ -429,6 +429,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc)
|
||||||
while (muxc->num_adapters) {
|
while (muxc->num_adapters) {
|
||||||
struct i2c_adapter *adap = muxc->adapter[--muxc->num_adapters];
|
struct i2c_adapter *adap = muxc->adapter[--muxc->num_adapters];
|
||||||
struct i2c_mux_priv *priv = adap->algo_data;
|
struct i2c_mux_priv *priv = adap->algo_data;
|
||||||
|
struct device_node *np = adap->dev.of_node;
|
||||||
|
|
||||||
muxc->adapter[muxc->num_adapters] = NULL;
|
muxc->adapter[muxc->num_adapters] = NULL;
|
||||||
|
|
||||||
|
@ -438,6 +439,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc)
|
||||||
|
|
||||||
sysfs_remove_link(&priv->adap.dev.kobj, "mux_device");
|
sysfs_remove_link(&priv->adap.dev.kobj, "mux_device");
|
||||||
i2c_del_adapter(adap);
|
i2c_del_adapter(adap);
|
||||||
|
of_node_put(np);
|
||||||
kfree(priv);
|
kfree(priv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue