diff options
| author | Eric Laurent <elaurent@google.com> | 2015-01-09 17:58:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-09 17:58:33 +0000 |
| commit | 7e9abab1940091b4c4d7589160855870fdda437e (patch) | |
| tree | 43c2be6f12d209cf75ce72029646623019cb2e8d /modules | |
| parent | 06fcfc506c44724bbd8089e8971b77aa8edfdde8 (diff) | |
| parent | b338957d02528e5b51a15c5ce21e96fad4ff4a6f (diff) | |
| download | hardware_libhardware-7e9abab1940091b4c4d7589160855870fdda437e.zip hardware_libhardware-7e9abab1940091b4c4d7589160855870fdda437e.tar.gz hardware_libhardware-7e9abab1940091b4c4d7589160855870fdda437e.tar.bz2 | |
am b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"
* commit 'b338957d02528e5b51a15c5ce21e96fad4ff4a6f':
usbaudio: Return 0 bytes on failure in capture
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/usbaudio/audio_hw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c index 0ee44c5..4188373 100644 --- a/modules/usbaudio/audio_hw.c +++ b/modules/usbaudio/audio_hw.c @@ -842,6 +842,8 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, size_t byte num_read_buff_bytes = convert_32_to_16(read_buff, num_read_buff_bytes / 4, out_buff); } else { + LOG_ALWAYS_FATAL("Unsupported format"); + num_read_buff_bytes = 0; goto err; } } @@ -865,6 +867,8 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, size_t byte /* 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 { + num_read_buff_bytes = 0; } err: |