aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Nikolaus Voss <nv@vosn.de>2019-02-11 11:30:52 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2019-02-11 12:34:13 +0100
commitf81e0120f4478c58e126bcadb19b9954ed184e8f (patch)
tree4b55de0ef93e564494f4b6763203cd4001150cd0
parent61052d1bb8fe5da745c4333a8bf7d031d636b76e (diff)
downloadbusybox-f81e0120f4478c58e126bcadb19b9954ed184e8f.tar.gz
busybox-f81e0120f4478c58e126bcadb19b9954ed184e8f.tar.bz2
i2c_tools.c: i2ctransfer
Call i2c_set_slave_addr() unconditionally as busy checking is skipped depending on force argument. Clarify usage texts for -f and -a flags. Signed-off-by: Nikolaus Voss <nv@vosn.de> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--miscutils/i2c_tools.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 455ff028d..7a2e8534a 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -1406,8 +1406,8 @@ static void check_i2c_func(int fd)
//usage:#define i2ctransfer_full_usage "\n\n"
//usage: "Read/write I2C data in one transfer"
//usage: "\n"
-//usage: "\n -f Force access"
-//usage: "\n -a Force scanning of non-regular addresses"
+//usage: "\n -f Force access to busy addresses"
+//usage: "\n -a Force access to non-regular addresses"
//usage: "\n -y Disable interactive mode"
int i2ctransfer_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int i2ctransfer_main(int argc UNUSED_PARAM, char **argv)
@@ -1467,9 +1467,7 @@ int i2ctransfer_main(int argc UNUSED_PARAM, char **argv)
len = xstrtou_range(arg_ptr, 0, 0, 0xffff);
if (end) {
bus_addr = xstrtou_range(end + 1, 0, first, last);
-//TODO: will this work correctly if -f is specified?
- if (!(opts & opt_f))
- i2c_set_slave_addr(fd, bus_addr, (opts & opt_f));
+ i2c_set_slave_addr(fd, bus_addr, (opts & opt_f));
} else {
/* Reuse last address if possible */
if (bus_addr < 0)