Merge commit '83b47a68' into manualmerge

diff --cc modules/usbaudio/audio_hw.c
index 4188373,49c99af..ad01833
--- 1/modules/usbaudio/audio_hw.c
--- 2/modules/usbaudio/audio_hw.c
+++ b/modules/usbaudio/audio_hw.c
@@@ -867,8 -867,8 +869,8 @@@ static ssize_t in_read(struct audio_str
          /* no need to acquire in->dev->lock to read mic_muted here as we don't change its state */
          if (num_read_buff_bytes > 0 && in->dev->mic_muted)
              memset(buffer, 0, num_read_buff_bytes);
 -    } else if (ret == -ENODEV) {
 -            num_read_buff_bytes = 0; //reset the  value after USB headset is unplugged
 +    } else {
-         num_read_buff_bytes = 0;
++        num_read_buff_bytes = 0; // reset the value after USB headset is unplugged
      }
  
  err: