projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
020bd6c
)
spi: spidev_test: Check input_tx and input_file first after parse options
author
Tiezhu Yang
<yangtiezhu@loongson.cn>
Thu, 13 Feb 2020 04:16:06 +0000
(12:16 +0800)
committer
Mark Brown
<broonie@kernel.org>
Thu, 13 Feb 2020 13:17:19 +0000
(13:17 +0000)
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>
tools/spi/spidev_test.c
patch
|
blob
|
history
diff --git
a/tools/spi/spidev_test.c
b/tools/spi/spidev_test.c
index 113b1e1d62caf7f46f2dc83100fcb975b3348044..5866178cdcc9586c8589d0a58caf7e21420c9c55 100644
(file)
--- 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)