This is a note to let you know that I've just added the patch titled
Revert "tc358743: fix register i2c_rd/wr function fix"
to the 4.4-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:
revert-tc358743-fix-register-i2c_rd-wr-function-fix.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From guillaume.bertholon@xxxxxx Tue Feb 1 18:50:44 2022
From: Guillaume Bertholon <guillaume.bertholon@xxxxxx>
Date: Tue, 1 Feb 2022 18:14:41 +0100
Subject: Revert "tc358743: fix register i2c_rd/wr function fix"
To: gregkh@xxxxxxxxxxxxxxxxxxx
Cc: stable@xxxxxxxxxxxxxxx, Guillaume Bertholon <guillaume.bertholon@xxxxxx>
Message-ID: <1643735681-14816-1-git-send-email-guillaume.bertholon@xxxxxx>
From: Guillaume Bertholon <guillaume.bertholon@xxxxxx>
This reverts commit a3f9c74652c749486bf9e989caabcae6f68272ee.
The reverted commit was backported and applied twice on the stable branch:
- First as commit 44f3c2b6e5e9 ("tc358743: fix register i2c_rd/wr
function fix") at the right position `i2c_wr8_and_or`
- Then as commit a3f9c74652c7 ("tc358743: fix register i2c_rd/wr
function fix") on the wrong function `i2c_wr16_and_or`
Fixes: a3f9c74652c7 ("tc358743: fix register i2c_rd/wr function fix")
Signed-off-by: Guillaume Bertholon <guillaume.bertholon@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/media/i2c/tc358743.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c
@@ -241,7 +241,7 @@ static void i2c_wr16(struct v4l2_subdev
static void i2c_wr16_and_or(struct v4l2_subdev *sd, u16 reg, u16 mask, u16 val)
{
- i2c_wrreg(sd, reg, (i2c_rdreg(sd, reg, 1) & mask) | val, 1);
+ i2c_wrreg(sd, reg, (i2c_rdreg(sd, reg, 2) & mask) | val, 2);
}
static u32 i2c_rd32(struct v4l2_subdev *sd, u16 reg)
Patches currently in stable-queue which might be from guillaume.bertholon@xxxxxx are
queue-4.4/bluetooth-mgmt-fix-misplaced-bt_hs-check.patch
queue-4.4/revert-tc358743-fix-register-i2c_rd-wr-function-fix.patch
queue-4.4/kvm-x86-fix-misplaced-backport-of-work-around-leak-of-uninitialized-stack-contents.patch
queue-4.4/revert-drm-radeon-ci-disable-mclk-switching-for-high-refresh-rates-v2.patch
