X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cmd%2Fusb_mass_storage.c;h=c5c6899787c84a746afb30317433ab9c779f39e8;hb=dd9056c06a0557bc08ca986530024568e01ede6f;hp=cfeecb7068a6c7ed5170297ae6eceaceba477dd5;hpb=4f42a0d7210bd8d4d1f5e2fb73456679d74c44cd;p=oweals%2Fu-boot.git

diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index cfeecb7068..c5c6899787 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 Samsung Electronics
  * Lukasz Majewski <l.majewski@samsung.com>
  *
  * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <errno.h>
@@ -12,9 +11,11 @@
 #include <command.h>
 #include <console.h>
 #include <g_dnl.h>
+#include <malloc.h>
 #include <part.h>
 #include <usb.h>
 #include <usb_mass_storage.h>
+#include <watchdog.h>
 
 static int ums_read_sector(struct ums *ums_dev,
 			   ulong start, lbaint_t blkcnt, void *buf)
@@ -161,22 +162,22 @@ static int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 
 	controller_index = (unsigned int)(simple_strtoul(
 				usb_controller,	NULL, 0));
-	if (board_usb_init(controller_index, USB_INIT_DEVICE)) {
-		pr_err("Couldn't init USB controller.");
+	if (usb_gadget_initialize(controller_index)) {
+		pr_err("Couldn't init USB controller.\n");
 		rc = CMD_RET_FAILURE;
 		goto cleanup_ums_init;
 	}
 
 	rc = fsg_init(ums, ums_count);
 	if (rc) {
-		pr_err("fsg_init failed");
+		pr_err("fsg_init failed\n");
 		rc = CMD_RET_FAILURE;
 		goto cleanup_board;
 	}
 
 	rc = g_dnl_register("usb_dnl_ums");
 	if (rc) {
-		pr_err("g_dnl_register failed");
+		pr_err("g_dnl_register failed\n");
 		rc = CMD_RET_FAILURE;
 		goto cleanup_board;
 	}
@@ -227,12 +228,14 @@ static int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 			rc = CMD_RET_SUCCESS;
 			goto cleanup_register;
 		}
+
+		WATCHDOG_RESET();
 	}
 
 cleanup_register:
 	g_dnl_unregister();
 cleanup_board:
-	board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+	usb_gadget_release(controller_index);
 cleanup_ums_init:
 	ums_fini();