Merge e219885766e45e691c212d9a0e1ab5a3a46ce0df on remote branch

Change-Id: Ia89718d36341f99ff9fe3ecb4e39628a64dce569
diff --git a/device/src/SpeakerProtection.cpp b/device/src/SpeakerProtection.cpp
index 30b3c92..3e0fd56 100644
--- a/device/src/SpeakerProtection.cpp
+++ b/device/src/SpeakerProtection.cpp
@@ -2843,7 +2843,7 @@
     }
     stream = static_cast<Stream *>(activeStreams[0]);
     stream->getAssociatedSession(&session);
-    for (int ch = numberOfChannels; ch != 0; ch == ch >> CHANNELS_2) {
+    for (int ch = numberOfChannels; ch != 0; ch = ch >> CHANNELS_2) {
         if (ch == CHANNELS_4)
             tagid = MODULE_SP2;
         else {
@@ -2999,7 +2999,7 @@
         goto exit;
     }
 
-    for (int ch = numberOfChannels; ch != 0; ch == ch >> CHANNELS_2) {
+    for (int ch = numberOfChannels; ch != 0; ch = ch >> CHANNELS_2) {
 
         if (ch == CHANNELS_4)
             tagid = MODULE_VI2;