Browse Source

Revert "tools: i2ctransfer: add check for returned length from driver"

This reverts commit 34806fc4e7. It was
developed against an experimental kernel. The regular kernel does not
update the new message length to userspace, so the check is always false
positive. We can't change the kernel behaviour because it would break
the ABI. So revert this commit.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
tags/v4.3
Wolfram Sang 5 years ago
committed by Wolfram Sang
parent
commit
06a1909ae1
  1. 1
      CHANGES
  2. 7
      tools/i2ctransfer.c

1
CHANGES

@ -3,6 +3,7 @@ i2c-tools CHANGES
master
eeprom, eepromer: removed the tools in favor of eeprog
i2ctransfer: reverted check for returned length from driver
4.2 (2020-09-22)
manpages: Add BUGS section to let people know how to contact us

7
tools/i2ctransfer.c

@ -88,12 +88,7 @@ static void print_msgs(struct i2c_msg *msgs, __u32 nmsgs, unsigned flags)
int recv_len = msgs[i].flags & I2C_M_RECV_LEN;
int print_buf = (read && (flags & PRINT_READ_BUF)) ||
(!read && (flags & PRINT_WRITE_BUF));
__u16 len = msgs[i].len;
if (recv_len && print_buf && len != msgs[i].buf[0] + 1) {
fprintf(stderr, "Correcting wrong msg length after recv_len! Please fix the I2C driver and/or report.\n");
len = msgs[i].buf[0] + 1;
}
__u16 len = recv_len ? msgs[i].buf[0] + 1 : msgs[i].len;
if (flags & PRINT_HEADER) {
fprintf(output, "msg %u: addr 0x%02x, %s, len ",

Loading…
Cancel
Save