From 425278ac0d51fd33ee328856078c702ffb3a3a52 Mon Sep 17 00:00:00 2001 From: Bernhard Nortmann Date: Wed, 13 Apr 2016 08:39:27 +0200 Subject: [PATCH] fel: Do a clean exit(0) after printing usage help Gracefully shut down the FEL utility, instead of continuing execution. This avoids a possible "ERROR: Allwinner USB FEL device not found!" when doing a plain `./sunxi-fel` without any arguments (and no suitable USB device connected). Signed-off-by: Bernhard Nortmann --- fel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fel.c b/fel.c index dedde55..674094a 100644 --- a/fel.c +++ b/fel.c @@ -1369,8 +1369,6 @@ int main(int argc, char **argv) libusb_device_handle *handle; int busnum = -1, devnum = -1; int iface_detached = -1; - int rc = libusb_init(NULL); - assert(rc == 0); if (argc <= 1) { printf("Usage: %s [options] command arguments... [command...]\n" @@ -1407,6 +1405,7 @@ int main(int argc, char **argv) " fill address length value Fill memory\n" , argv[0] ); + exit(0); } /* process all "prefix"-type arguments first */ @@ -1434,6 +1433,8 @@ int main(int argc, char **argv) argv += 1; } + int rc = libusb_init(NULL); + assert(rc == 0); handle = open_fel_device(busnum, devnum, AW_USB_VENDOR_ID, AW_USB_PRODUCT_ID); assert(handle != NULL); rc = libusb_claim_interface(handle, 0);