summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2018-05-21 09:29:38 +0200
committerPeter Rosin <peda@axentia.se>2018-05-24 13:45:04 +0200
commit5a9dcd81908bb2bc6d8ed22bc4b7eec191024557 (patch)
treed722b66c305acdf2ffc01ab4202dcb908b4b939c
parenti2c: mux: improve error message for failed symlink (diff)
downloadlinux-5a9dcd81908bb2bc6d8ed22bc4b7eec191024557.tar.xz
linux-5a9dcd81908bb2bc6d8ed22bc4b7eec191024557.zip
i2c: mux: demux-pinctrl: use proper parent device for demux adapter
Due to a typo, the wrong parent device was assigned to the newly created demuxing adapter device. It got connected to the demuxing platform device but not to the selected parent I2C adapter device. Fix it to get a proper parent-child relationship of the demuxed busses. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Peter Rosin <peda@axentia.se>
-rw-r--r--drivers/i2c/muxes/i2c-demux-pinctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 428de4c97fb2..035032e20327 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -106,7 +106,7 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne
priv->cur_adap.owner = THIS_MODULE;
priv->cur_adap.algo = &priv->algo;
priv->cur_adap.algo_data = priv;
- priv->cur_adap.dev.parent = priv->dev;
+ priv->cur_adap.dev.parent = &adap->dev;
priv->cur_adap.class = adap->class;
priv->cur_adap.retries = adap->retries;
priv->cur_adap.timeout = adap->timeout;