From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/4] dfu command: check return values
Date: Thu, 13 Feb 2014 10:42:51 +0100 [thread overview]
Message-ID: <1392284573-22410-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1392284573-22410-1-git-send-email-s.hauer@pengutronix.de>
Check the return value of usb_dfu_register and bail out
with an error if it fails. Also return successfully if it succeeds
instead of returning 1 unconditionally.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
commands/dfu.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/commands/dfu.c b/commands/dfu.c
index ec1197a..6bd43e4 100644
--- a/commands/dfu.c
+++ b/commands/dfu.c
@@ -101,7 +101,7 @@ static int do_dfu(int argc, char *argv[])
char *manufacturer = "barebox";
const char *productname = barebox_get_model();
u16 idVendor = 0, idProduct = 0;
-
+ int ret;
while((opt = getopt(argc, argv, "m:p:V:P:")) > 0) {
switch(opt) {
@@ -134,6 +134,7 @@ static int do_dfu(int argc, char *argv[])
dfu_alts = xrealloc(dfu_alts, sizeof(*dfu_alts) * (n + 1));
if (dfu_do_parse_one(argstr, &endptr, &dfu_alts[n])) {
printf("parse error\n");
+ ret = -EINVAL;
goto out;
}
argstr = endptr;
@@ -147,7 +148,7 @@ static int do_dfu(int argc, char *argv[])
pdata.idVendor = idVendor;
pdata.idProduct = idProduct;
- usb_dfu_register(&pdata);
+ ret = usb_dfu_register(&pdata);
out:
while (n) {
@@ -155,8 +156,10 @@ out:
free(dfu_alts[n].name);
free(dfu_alts[n].dev);
};
+
free(dfu_alts);
- return 1;
+
+ return ret;
}
BAREBOX_CMD_HELP_START(dfu)
--
1.8.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-02-13 9:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-13 9:42 USB gadget / dfu fixes Sascha Hauer
2014-02-13 9:42 ` [PATCH 1/4] USB gadget: at91: return error when no udc is registered Sascha Hauer
2014-02-13 9:42 ` Sascha Hauer [this message]
2014-02-13 9:42 ` [PATCH 3/4] USB gadget: fsl: Bail out if no udc exists Sascha Hauer
2014-02-13 9:42 ` [PATCH 4/4] USB gadget: dfu: propagate error from usb_gadget_poll Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392284573-22410-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox