Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'

[u-boot] / drivers / usb / gadget / f_thor.c

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index f5c0224f21351b1f6a7a307ff132455ab80f431d..28f215e07c6efa34e16ce2af151b23dc47e4fdc6 100644 (file)
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -204,14 +204,14 @@ static long long int download_head(unsigned long long total,
 
 static int download_tail(long long int left, int cnt)
 {
+       struct dfu_entity *dfu_entity = dfu_get_entity(alt_setting_num);
        void *transfer_buffer = dfu_get_buf();
        int ret;
 
        debug("%s: left: %llu cnt: %d\n", __func__, left, cnt);
 
        if (left) {
-               ret = dfu_write(dfu_get_entity(alt_setting_num),
-                               transfer_buffer, left, cnt++);
+               ret = dfu_write(dfu_entity, transfer_buffer, left, cnt++);
                if (ret) {
                        error("DFU write failed [%d]: left: %llu", ret, left);
                        return ret;
@@ -219,16 +219,15 @@ static int download_tail(long long int left, int cnt)
        }
 
        /*
-        * To store last "packet" DFU storage backend requires dfu_write with
-        * size parameter equal to 0
+        * To store last "packet" or write file from buffer to filesystem
+        * DFU storage backend requires dfu_flush
         *
         * This also frees memory malloc'ed by dfu_get_buf(), so no explicit
         * need fo call dfu_free_buf() is needed.
         */
-       ret = dfu_write(dfu_get_entity(alt_setting_num),
-                       transfer_buffer, 0, cnt);
+       ret = dfu_flush(dfu_entity, transfer_buffer, 0, cnt);
        if (ret)
-               error("DFU write failed [%d] cnt: %d", ret, cnt);
+               error("DFU flush failed!");
 
        return ret;
 }
@@ -999,3 +998,5 @@ int thor_add(struct usb_configuration *c)
        debug("%s:\n", __func__);
        return thor_func_init(c);
 }
+
+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_thor, thor_add);