commit e3afca2e1219ee1a4d799be484bbc91c6065fcdb
author vivek mehta <mvivek@codeaurora.org> Tue Apr 11 17:13:50 2017 -0700
committer David Lin <dtwlin@google.com> Mon Apr 17 17:25:17 2017 -0700
tree fa8ccfb5139392266847212bbab5a3b953fad1af
parent 882a72dc4a76ff14bb65da0eab029a9f5a258dcd

hal: fix variable initialization

- in case of failure before frame_size declaration, code will jump
  to exit label which will result in error.
- fix this by declaring variable at the beginning of the function

Bug: 37197465
Test: Non-offload PCM playback on Marlin
Change-Id: I9cf83bd34d9f777b605b8d0d44a46a0ab6be802b
Signed-off-by: David Lin <dtwlin@google.com>

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 11b5a69..db29122 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2223,6 +2223,9 @@
     int error_code = ERROR_CODE_STANDBY;
 
     lock_output_stream(out);
+    // this is always nonzero
+    const int frame_size = audio_stream_out_frame_size(stream);
+
     if (out->usecase == USECASE_AUDIO_PLAYBACK_MMAP) {
         error_code = ERROR_CODE_WRITE;
         goto exit;
@@ -2244,9 +2247,6 @@
         }
     }
 
-    // this is always nonzero
-    const size_t frame_size = audio_stream_out_frame_size(stream);
-
     if (out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD) {
         ALOGVV("%s: writing buffer (%zu bytes) to compress device", __func__, bytes);
         if (out->send_new_metadata) {