Patch "i2c: mux: pca954x: retry updating the mux selection on failure" has been added to the 4.7-stable tree

Patch "i2c: mux: pca954x: retry updating the mux selection on failure" has been added to the 4.7-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    i2c: mux: pca954x: retry updating the mux selection on failure

to the 4.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     i2c-mux-pca954x-retry-updating-the-mux-selection-on-failure.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 463e8f845cbf1c01e4cc8aeef1703212991d8e1e Mon Sep 17 00:00:00 2001
From: Peter Rosin <peda@axentia.se>
Date: Wed, 14 Sep 2016 15:24:12 +0200
Subject: i2c: mux: pca954x: retry updating the mux selection on failure

From: Peter Rosin <peda@axentia.se>

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/i2c/muxes/i2c-mux-pca954x.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -164,7 +164,7 @@ static int pca954x_select_chan(struct i2
 	/* Only select the channel if its different from the last channel */
 	if (data->last_chan != regval) {
 		ret = pca954x_reg_write(muxc->parent, client, regval);
-		data->last_chan = regval;
+		data->last_chan = ret ? 0 : regval;
 	}
 
 	return ret;


Patches currently in stable-queue which might be from peda@axentia.se are

queue-4.7/i2c-mux-pca954x-retry-updating-the-mux-selection-on-failure.patch