Skip to contentSkip to conversation

i2c: meson: fix wrong variable usage in meson_i2c_put_data

PATCH New Heiner Kallweit 3 participants 3 messages Mar 7, 2017 – Mar 9, 2017

Subsystems (2)
Arm/Amlogic Meson SoC support I2C subsystem host drivers
lore
Share & tools
lore

Heiner Kallweit

author
#0 lore raw

PATCH 1/1 i2c: meson: fix wrong variable usage in meson_i2c_put_data

Most likely a copy & paste error.

Signed-off-by Heiner Kallweit <[email protected]>
---
 drivers/i2c/busses/i2c-meson.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-meson.c +1 -1
index 2aa61bbb..73b97c71 100644
@@ -175,7 +175,7 @@ static void meson_i2c_put_data(struct meson_i2c *i2c, char *buf, int len)
 		wdata1 |= *buf++ << ((i - 4) * 8);
 
 	writel(wdata0, i2c->regs + REG_TOK_WDATA0);
-	writel(wdata0, i2c->regs + REG_TOK_WDATA1);
+	writel(wdata1, i2c->regs + REG_TOK_WDATA1);
 
 	dev_dbg(i2c->dev, "%s: data %08x %08x len %d\n", __func__,
 		wdata0, wdata1, len);
Signature · 1 line
2.12.0
reviewer
#1 lore raw

PATCH 1/1 i2c: meson: fix wrong variable usage in meson_i2c_put_data

Quoted 17 lines · Heiner Kallweit

Most likely a copy & paste error.

Signed-off-by Heiner Kallweit <[email protected]>

---
?drivers/i2c/busses/i2c-meson.c | 2 +-
?1 file changed, 1 insertion(+), 1 deletion(-)

drivers/i2c/busses/i2c-meson.c +0 -0
index 2aa61bbb..73b97c71 100644
@@ -175,7 +175,7 @@ static void meson_i2c_put_data(struct meson_i2c *i2c, char *buf, int len)
 ?		wdata1 |= *buf++ << ((i - 4) * 8);

?
? writel(wdata0, i2c->regs + REG_TOK_WDATA0);

drivers/i2c/busses/i2c-meson.c +1 -1
-	writel(wdata0, i2c->regs + REG_TOK_WDATA1);
+	writel(wdata1, i2c->regs + REG_TOK_WDATA1);
Quoted 3 lines

?
? dev_dbg(i2c->dev, "%s: data %08x %08x len %d\n", __func__,
? wdata0, wdata1, len);

Good catch, Strange it did not show up before.

You are just missing the Fixes tag.

Fixes 30021e3707a7 ("i2c: add support for Amlogic Meson I2C controller")
Acked-by Jerome Brunet <[email protected]>
Applied
#2 lore raw

PATCH 1/1 i2c: meson: fix wrong variable usage in meson_i2c_put_data

In reply to Heiner Kallweit
Quoted 3 lines · Heiner Kallweit

Most likely a copy & paste error.

Signed-off-by Heiner Kallweit <[email protected]>

Applied to for-current, thanks!

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20170309/27a52d1e/attachment.sig>