Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / common / dfu.c

diff --git a/common/dfu.c b/common/dfu.c
index 14b60f1fbbb0039b9855cd20ae6eeaa2c9aa4f4d..546a1ab9b4c0db72963ab7f14a24d86c6b6f47c6 100644 (file)
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -24,9 +24,18 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
        bool dfu_reset = false;
        int ret, i = 0;
 
-       board_usb_init(usbctrl_index, USB_INIT_DEVICE);
+       ret = board_usb_init(usbctrl_index, USB_INIT_DEVICE);
+       if (ret) {
+               error("board usb init failed\n");
+               return CMD_RET_FAILURE;
+       }
        g_dnl_clear_detach();
-       g_dnl_register(usb_dnl_gadget);
+       ret = g_dnl_register(usb_dnl_gadget);
+       if (ret) {
+               error("g_dnl_register failed");
+               return CMD_RET_FAILURE;
+       }
+
        while (1) {
                if (g_dnl_detach()) {
                        /*
@@ -79,7 +88,7 @@ exit:
        board_usb_cleanup(usbctrl_index, USB_INIT_DEVICE);
 
        if (dfu_reset)
-               run_command("reset", 0);
+               do_reset(NULL, 0, 0, NULL);
 
        g_dnl_clear_detach();