X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cmd%2Fusb_gadget_sdp.c;h=2ead06be9f5acf351f2e24e450ecff683167f6d0;hb=34971eec84e25773e29acfeeeae5ccb88f197ab4;hp=97d00ec5453879c37c40377454bd6aa2807e18bd;hpb=e12546de54fc9be818e8d39967b07fa351d9e5ba;p=oweals%2Fu-boot.git

diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 97d00ec545..2ead06be9f 100644
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_sdp.c -- sdp command
  *
  * Copyright (C) 2016 Toradex
  * Author: Stefan Agner <stefan.agner@toradex.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
@@ -14,17 +13,21 @@
 
 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;
 
 	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) {
@@ -38,9 +41,10 @@ static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 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,