commit bae27c1095eb5e3503c9bdc7e2c6d5b8ab98dba2
author Yunlian Jiang <yunlian@google.com> Wed Feb 22 01:53:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 01:53:51 2017 +0000
tree 027e74eb9f8c6e3c026a2bb552f277e6ce5c6756
parent b29fea00e144a2f72ab76d925a56e529fefdace5
parent ad17ddb376a88792635bb7155a735c56060870f3

Merge "fix uninitialized warning." am: 2008d8857c
am: ad17ddb376

Change-Id: I8fd647b38b0a911a9bc7fbcd9cefd046362dec5b

media/mtp/MtpFfsHandle.cpp

diff --git a/media/mtp/MtpFfsHandle.cpp b/media/mtp/MtpFfsHandle.cpp
index 6c7ffcb..58d2bb8 100644
--- a/media/mtp/MtpFfsHandle.cpp
+++ b/media/mtp/MtpFfsHandle.cpp
@@ -641,6 +641,7 @@
     if (file_length == static_cast<unsigned>(init_read_len)) return 0;
     file_length -= init_read_len;
     offset += init_read_len;
+    ret = 0;
 
     // Break down the file into pieces that fit in buffers
     while(file_length > 0) {