Don't use command error codes in the common code base. Instead the commands should convert common error codes into command error codes. Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx> --- commands/dfu.c | 2 +- commands/usbgadget.c | 5 +++-- common/usbgadget.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/commands/dfu.c b/commands/dfu.c index 2116747f6885..bbe75841b914 100644 --- a/commands/dfu.c +++ b/commands/dfu.c @@ -31,7 +31,7 @@ static int do_dfu(int argc, char *argv[]) funcs.dfu_opts = argv[optind]; ret = usbgadget_register(&funcs); if (ret) - return ret; + return COMMAND_ERROR_USAGE; command_slice_release(); while (!usb_dfu_detached()) { diff --git a/commands/usbgadget.c b/commands/usbgadget.c index e69660fde541..736ccb5d9185 100644 --- a/commands/usbgadget.c +++ b/commands/usbgadget.c @@ -20,6 +20,7 @@ static int do_usbgadget(int argc, char *argv[]) { struct usbgadget_funcs funcs = {}; int opt; + int ret; while ((opt = getopt(argc, argv, "asdA::D::S::b")) > 0) { switch (opt) { @@ -50,8 +51,8 @@ static int do_usbgadget(int argc, char *argv[]) } } - - return usbgadget_register(&funcs); + ret = usbgadget_register(&funcs); + return ret ? COMMAND_ERROR_USAGE : 0; } BAREBOX_CMD_HELP_START(usbgadget) diff --git a/common/usbgadget.c b/common/usbgadget.c index 371355116364..9974be57d1cb 100644 --- a/common/usbgadget.c +++ b/common/usbgadget.c @@ -71,7 +71,7 @@ int usbgadget_register(const struct usbgadget_funcs *funcs) if (usb_multi_count_functions(opts) == 0) { pr_warn("No functions to register\n"); - ret = COMMAND_ERROR_USAGE; + ret = -EINVAL; goto err; } -- 2.39.2