diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-03-09 16:34:41 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-03-09 16:34:41 +0100 |
| commit | e61dfc836b8a95c54e5b41d2247df258b0593a1b (patch) | |
| tree | 04edfe6e90608d0c8f37c1aefc5472e94ad6b087 /drivers/i2c | |
| parent | Revert "i2c: add missing of_node_put in i2c_mux_del_adapters" (diff) | |
| parent | i2c: add missing of_node_put in i2c_mux_del_adapters (diff) | |
| download | linux-e61dfc836b8a95c54e5b41d2247df258b0593a1b.tar.xz linux-e61dfc836b8a95c54e5b41d2247df258b0593a1b.zip | |
Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux into i2c/for-current
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-mux.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 83768e85a919..2178266bca79 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -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; @@ -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); } } |