From: Tiezhu Yang Date: Thu, 13 Feb 2020 04:16:06 +0000 (+0800) Subject: spi: spidev_test: Check input_tx and input_file first after parse options X-Git-Tag: io_uring-5.7-2020-04-09~35^2~1^2~51 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1f3c36328a487059beebd1f7be042e3b7abf7d34;p=linux-block.git 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 Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/1581567368-8055-2-git-send-email-yangtiezhu@loongson.cn Signed-off-by: Mark Brown --- 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)