diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2021-02-09 12:05:56 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2021-03-07 06:45:05 +0100 |
| commit | 06a1909ae1e8ae1edc70dc48dd22a32ba5eceecb (patch) | |
| tree | 83ed87d5f76c63968ae8608deb75745e8797148b | |
| parent | 37f5ab8d4e334d89559594ab68f162e5ab3a3bc2 (diff) | |
| download | i2c-tools-06a1909ae1e8ae1edc70dc48dd22a32ba5eceecb.tar.gz | |
Revert "tools: i2ctransfer: add check for returned length from driver"
This reverts commit 34806fc4e7090b34e32fa1110d546ab5ce01a6a0. 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>
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | tools/i2ctransfer.c | 7 |
2 files changed, 2 insertions, 6 deletions
@@ -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 diff --git a/tools/i2ctransfer.c b/tools/i2ctransfer.c index f2a4df8..b0e8d43 100644 --- a/tools/i2ctransfer.c +++ b/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 ", |