Merge remote-tracking branch 'regmap/for-next' into sound/upstream-20260528

bardliao · bardliao · commit 8edc7941137e · 2026-05-28T14:25:44.000+08:00
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
@@ -337,7 +337,7 @@ static int regmap_smbus_word_write_reg16(void *context, const void *data,
 	val = ((u8 *)data)[2];
 
 	return i2c_smbus_write_word_data(i2c, addr_hi,
-					 cpu_to_le16(((u16)val << 8) | addr_lo));
+					 ((u16)val << 8) | addr_lo);
 }
 
 static const struct regmap_bus regmap_smbus_byte_word_reg16 = {

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ static int regmap_smbus_word_write_reg16(void context, const void data,`
`337`	`337`	`val = ((u8 *)data)[2];`
`338`	`338`
`339`	`339`	`return i2c_smbus_write_word_data(i2c, addr_hi,`
`340`		`- cpu_to_le16(((u16)val << 8) \| addr_lo));`
	`340`	`+ ((u16)val << 8) \| addr_lo);`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`static const struct regmap_bus regmap_smbus_byte_word_reg16 = {`