Skip to contentSkip to conversation

Patch "i2c: i2c-mux-pca954x: fix deselect enabling for device-tree" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 21, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

i2c: i2c-mux-pca954x: fix deselect enabling for device-tree

to the 4.8-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-i2c-mux-pca954x-fix-deselect-enabling-for-device-tree.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ad092de60f865c1ad94221bd06d381ecea446cc8 Mon Sep 17 00:00:00 2001

From: Alex Hemme <[email protected]>
Date: Sat, 19 Nov 2016 10:48:38 +0100
Subject: i2c: i2c-mux-pca954x: fix deselect enabling for device-tree

From: Alex Hemme <[email protected]>

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")
[touched up a few minor issues /peda]
---
 drivers/i2c/muxes/i2c-mux-pca954x.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/muxes/i2c-mux-pca954x.c +2 -2
@@ -247,9 +247,9 @@ static int pca954x_probe(struct i2c_clie
 				/* 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);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/i2c-i2c-mux-pca954x-fix-deselect-enabling-for-device-tree.patch