Merge 5ae5a650c2cd3e50a6e41f0ef471963035b56325 on remote branch

Change-Id: Id4218e195b4e39fd3303def9c62688f1ec710c74
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 2a13103..a08aafa 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2063,7 +2063,6 @@
     }
 
     while ((tdirent = readdir(tdir))) {
-        char buf[50];
         struct dirent *tzdirent;
         DIR *tzdir = NULL;
 
@@ -2071,6 +2070,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);
@@ -2083,11 +2083,11 @@
                     audio_extn_spkr_prot_set_parameters(parms, buf, 0);
                 }
                 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);
     }