commit 146c371e902e047ad9d9eeadb9af2da6f8df10e1
author Linux Build Service Account <lnxbuild@localhost> Sat Apr 07 18:55:18 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Apr 07 18:55:18 2018 -0700
tree b1d404d4d6f33eff1f3498d5310352a644d7bad3
parent 96a2a739cacaba3acca8fabaa089ded2a4ce025a
parent 148ec935643554b51c7e076d73dfed4aafd72a2c

Merge "hal: Fix incorrect wsa count update during platform_init"

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 3c6b555..2e824b0 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2013,7 +2013,6 @@
     }
 
     while ((tdirent = readdir(tdir))) {
-        char buf[50];
         struct dirent *tzdirent;
         DIR *tzdir = NULL;
 
@@ -2021,6 +2020,7 @@
         if (!tzdir)
             continue;
         while ((tzdirent = readdir(tzdir))) {
+            char buf[50] = {0};
             if (strcmp(tzdirent->d_name, "type"))
                 continue;
             snprintf(name, MAX_PATH, TZ_TYPE, tzn);
@@ -2028,11 +2028,11 @@
             read_line_from_file(name, buf, sizeof(buf));
             if (strstr(buf, file)) {
                 wsa_count++;
-                /*We support max only two WSA speakers*/
-                if (wsa_count == 2)
-                    break;
             }
             tzn++;
+            /*We support max only two WSA speakers*/
+            if (wsa_count == 2)
+                break;
         }
         closedir(tzdir);
     }