commit e64994292cb02fae66f04002e1121d29979503d1
author Eric Laurent <elaurent@google.com> Fri Jan 09 17:03:27 2015 -0800
committer Eric Laurent <elaurent@google.com> Fri Jan 09 17:04:40 2015 -0800
tree fe748753812ebc4dcd93f7230b524ffafd45e0d9
parent 7e9abab1940091b4c4d7589160855870fdda437e
parent 83b47a6891a5bf3d546f0f7a8976132e45169075

Merge commit '83b47a68' into manualmerge

modules/usbaudio/audio_hw.c

diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c
index 4188373..ad01833 100644
--- a/modules/usbaudio/audio_hw.c
+++ b/modules/usbaudio/audio_hw.c
@@ -775,6 +775,7 @@
     size_t num_read_buff_bytes = 0;
     void * read_buff = buffer;
     void * out_buff = buffer;
+    int ret = 0;
 
     struct stream_in * in = (struct stream_in *)stream;
 
@@ -824,7 +825,8 @@
         read_buff = in->conversion_buffer;
     }
 
-    if (proxy_read(&in->proxy, read_buff, num_read_buff_bytes) == 0) {
+    ret = proxy_read(&in->proxy, read_buff, num_read_buff_bytes);
+    if (ret == 0) {
         /*
          * Do any conversions necessary to send the data in the format specified to/by the HAL
          * (but different from the ALSA format), such as 24bit ->16bit, or 4chan -> 2chan.
@@ -868,7 +870,7 @@
         if (num_read_buff_bytes > 0 && in->dev->mic_muted)
             memset(buffer, 0, num_read_buff_bytes);
     } else {
-        num_read_buff_bytes = 0;
+        num_read_buff_bytes = 0; // reset the value after USB headset is unplugged
     }
 
 err: