]> git.hungrycats.org Git - linux/commitdiff
i2c: mux: pca954x: retry updating the mux selection on failure
authorPeter Rosin <peda@axentia.se>
Wed, 14 Sep 2016 13:24:12 +0000 (15:24 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 Nov 2016 01:17:34 +0000 (01:17 +0000)
commit 463e8f845cbf1c01e4cc8aeef1703212991d8e1e upstream.

The cached value of the last selected channel prevents retries on the
next call, even on failure to update the selected channel. Fix that.

Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/i2c/muxes/i2c-mux-pca954x.c

index 9bd4212782ab834bff64a92bee447ae841441966..f1b945509477c4c23cd8f7eb6f32f5d3307fd071 100644 (file)
@@ -161,7 +161,7 @@ static int pca954x_select_chan(struct i2c_adapter *adap,
        /* Only select the channel if its different from the last channel */
        if (data->last_chan != regval) {
                ret = pca954x_reg_write(adap, client, regval);
-               data->last_chan = regval;
+               data->last_chan = ret ? 0 : regval;
        }
 
        return ret;