commit 9f84bbbce06b8aa6f59d760d85897c0d0c4d101e
author Yunlian Jiang <yunlian@google.com> Wed Feb 22 01:55:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 01:55:53 2017 +0000
tree 09fed0f455006366970096816d01514b3a8f1b79
parent 673774d14c3d7e9964f94e1c0aabfce5cf72acc8
parent bae27c1095eb5e3503c9bdc7e2c6d5b8ab98dba2

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

Change-Id: Ie8814a45544bbe9248d6116336547eb67b675583

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) {