Commit e61dfc83 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux into i2c/for-current

parents 8ce0928e 2e1e4949
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -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);
	}
	}
}
}