X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmd%2Fusb_gadget_sdp.c;h=1af82e1136656212caa26c327c49dc76e7e70795;hb=10f6e4dc3a16c21f235416f975ecf2070ceb351f;hp=ae4d73c1250d02eb082d65ea687c2d6ad663412e;hpb=2ee87b0c1a5439e4ad6467cb8d5e8fb58922ca4b;p=platform%2Fkernel%2Fu-boot.git diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c index ae4d73c..1af82e1 100644 --- a/cmd/usb_gadget_sdp.c +++ b/cmd/usb_gadget_sdp.c @@ -1,46 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * cmd_sdp.c -- sdp command * * Copyright (C) 2016 Toradex * Author: Stefan Agner - * - * SPDX-License-Identifier: GPL-2.0+ */ #include +#include #include #include #include -static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - int ret = CMD_RET_FAILURE; + int ret; if (argc < 2) return CMD_RET_USAGE; char *usb_controller = argv[1]; int controller_index = simple_strtoul(usb_controller, NULL, 0); - board_usb_init(controller_index, USB_INIT_DEVICE); + 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) { - pr_err("SDP init failed: %d", ret); + pr_err("SDP init failed: %d\n", ret); goto exit; } /* This command typically does not return but jumps to an image */ sdp_handle(controller_index); - pr_err("SDP ended"); + pr_err("SDP ended\n"); exit: g_dnl_unregister(); - board_usb_cleanup(controller_index, USB_INIT_DEVICE); +exit_register: + usb_gadget_release(controller_index); - return ret; + return CMD_RET_FAILURE; } U_BOOT_CMD(sdp, 2, 1, do_sdp,