diff options
| author | Alex Hemme <ahemme@cisco.com> | 2016-11-19 10:48:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-26 09:56:55 +0100 |
| commit | 504b60516ba796e1b73a16b3fe3520ce73935401 (patch) | |
| tree | 86cf4310a3dad54aff7631c43a1d9f23883f85bf /drivers | |
| parent | 45244660281c9a5b802e2e0ea012c7955a76741e (diff) | |
| download | lwn-504b60516ba796e1b73a16b3fe3520ce73935401.tar.gz lwn-504b60516ba796e1b73a16b3fe3520ce73935401.zip | |
i2c: i2c-mux-pca954x: fix deselect enabling for device-tree
commit ad092de60f865c1ad94221bd06d381ecea446cc8 upstream.
Deselect functionality can be ignored for device-trees with
"i2c-mux-idle-disconnect" entries if no platform_data is available.
By enabling the deselect functionality outside the platform_data
block the logic works as it did in previous kernels.
Fixes: 7fcac9807175 ("i2c: i2c-mux-pca954x: convert to use an explicit i2c mux core")
Signed-off-by: Alex Hemme <ahemme@cisco.com>
Signed-off-by: Ziyang Wu <ziywu@cisco.com>
[touched up a few minor issues /peda]
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/muxes/i2c-mux-pca954x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 3278ebf1cc5c..7e6f300009c5 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -247,9 +247,9 @@ static int pca954x_probe(struct i2c_client *client, /* discard unconfigured channels */ break; idle_disconnect_pd = pdata->modes[num].deselect_on_exit; - data->deselect |= (idle_disconnect_pd - || idle_disconnect_dt) << num; } + data->deselect |= (idle_disconnect_pd || + idle_disconnect_dt) << num; ret = i2c_mux_add_adapter(muxc, force, num, class); |