summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-06-17 11:27:21 -0400
committerTom Rini <trini@konsulko.com>2019-06-17 11:27:21 -0400
commitc3e8aa1a9ed5f6db7345b23a2f8f136e987ebd4d (patch)
treeebe52eaaed86f99d7f5ce1d6705f355454db54cc /cmd
parent77f6e2dd0551d8a825bab391a1bd6b838874bcd4 (diff)
parent220f655176de8e6aa4aaea91bb2182260d26c4a4 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Assorted gadget fixes
Diffstat (limited to 'cmd')
-rw-r--r--cmd/usb_gadget_sdp.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 808ed974fa..2ead06be9f 100644
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -13,7 +13,7 @@
static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- int ret = CMD_RET_FAILURE;
+ int ret;
if (argc < 2)
return CMD_RET_USAGE;
@@ -23,7 +23,11 @@ static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
usb_gadget_initialize(controller_index);
g_dnl_clear_detach();
- g_dnl_register("usb_dnl_sdp");
+ ret = g_dnl_register("usb_dnl_sdp");
+ if (ret) {
+ pr_err("SDP dnl register failed: %d\n", ret);
+ goto exit_register;
+ }
ret = sdp_init(controller_index);
if (ret) {
@@ -37,9 +41,10 @@ static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
exit:
g_dnl_unregister();
+exit_register:
usb_gadget_release(controller_index);
- return ret;
+ return CMD_RET_FAILURE;
}
U_BOOT_CMD(sdp, 2, 1, do_sdp,