Merge branch 'master' of git://git.denx.de/u-boot-arm

[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 feef9e4619c482c31d7ce5a45bbab55a772c6146..4e06273f7fb7e678b96a6bb3e11d6b8d6a4830a5 100644 (file)
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -219,21 +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_entity, transfer_buffer, 0, cnt);
-       if (ret)
-               error("DFU write failed [%d] cnt: %d", ret, cnt);
-
        ret = dfu_flush(dfu_entity, transfer_buffer, 0, cnt);
-       if (ret) {
+       if (ret)
                error("DFU flush failed!");
-               return ret;
-       }
 
        return ret;
 }
@@ -312,7 +306,6 @@ static int process_data(void)
        ALLOC_CACHE_ALIGN_BUFFER(struct rqt_box, rqt, sizeof(struct rqt_box));
        int ret = -EINVAL;
 
-       memset(rqt, 0, sizeof(rqt));
        memcpy(rqt, thor_rx_data_buf, sizeof(struct rqt_box));
 
        debug("+RQT: %d, %d\n", rqt->rqt, rqt->rqt_data);