Skip to content

Commit

Permalink
Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux
Browse files Browse the repository at this point in the history
… into i2c/for-current
  • Loading branch information
Wolfram Sang committed Mar 9, 2017
2 parents 8ce0928 + 2e1e494 commit e61dfc8
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/i2c/i2c-mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc)
while (muxc->num_adapters) {
struct i2c_adapter *adap = muxc->adapter[--muxc->num_adapters];
struct i2c_mux_priv *priv = adap->algo_data;
struct device_node *np = adap->dev.of_node;

muxc->adapter[muxc->num_adapters] = NULL;

Expand All @@ -438,6 +439,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc)

sysfs_remove_link(&priv->adap.dev.kobj, "mux_device");
i2c_del_adapter(adap);
of_node_put(np);
kfree(priv);
}
}
Expand Down

0 comments on commit e61dfc8

Please sign in to comment.