summaryrefslogtreecommitdiffstats
path: root/tools/spi
diff options
context:
space:
mode:
authorTiezhu Yang <yangtiezhu@loongson.cn>2020-02-13 12:16:06 +0800
committerMark Brown <broonie@kernel.org>2020-02-13 13:17:19 +0000
commit1f3c36328a487059beebd1f7be042e3b7abf7d34 (patch)
tree94b011ebb65df1f943c35382482f8980784b162b /tools/spi
parent020bd6c48ebd864d42b5b551a87a323e443918a6 (diff)
downloadlinux-stable-1f3c36328a487059beebd1f7be042e3b7abf7d34.tar.gz
linux-stable-1f3c36328a487059beebd1f7be042e3b7abf7d34.tar.bz2
linux-stable-1f3c36328a487059beebd1f7be042e3b7abf7d34.zip
spi: spidev_test: Check input_tx and input_file first after parse options
It is better to check input_tx and input_file first after parse options. Otherwise, it will do some useless operations when both -p and --input are selected. Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/1581567368-8055-2-git-send-email-yangtiezhu@loongson.cn Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'tools/spi')
-rw-r--r--tools/spi/spidev_test.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/spi/spidev_test.c b/tools/spi/spidev_test.c
index 113b1e1d62ca..5866178cdcc9 100644
--- a/tools/spi/spidev_test.c
+++ b/tools/spi/spidev_test.c
@@ -404,6 +404,9 @@ int main(int argc, char *argv[])
parse_opts(argc, argv);
+ if (input_tx && input_file)
+ pabort("only one of -p and --input may be selected");
+
fd = open(device, O_RDWR);
if (fd < 0)
pabort("can't open device");
@@ -445,9 +448,6 @@ int main(int argc, char *argv[])
printf("bits per word: %d\n", bits);
printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000);
- if (input_tx && input_file)
- pabort("only one of -p and --input may be selected");
-
if (input_tx)
transfer_escaped_string(fd, input_tx);
else if (input_file)