diff --git a/webrtc/common_audio/signal_processing/include/spl_inl_armv7.h b/webrtc/common_audio/signal_processing/include/spl_inl_armv7.h
index 0d10129a22..2718801159 100644
--- a/webrtc/common_audio/signal_processing/include/spl_inl_armv7.h
+++ b/webrtc/common_audio/signal_processing/include/spl_inl_armv7.h
@@ -110,15 +110,16 @@ static __inline int16_t WebRtcSpl_NormU32(uint32_t a) {
 
 static __inline int16_t WebRtcSpl_NormW16(int16_t a) {
   int32_t tmp = 0;
+  int32_t a_32 = a;
 
-  if (a == 0) {
+  if (a_32 == 0) {
     return 0;
   }
-  else if (a < 0) {
-    a ^= 0xFFFFFFFF;
+  else if (a_32 < 0) {
+    a_32 ^= 0xFFFFFFFF;
   }
 
-  __asm __volatile ("clz %0, %1":"=r"(tmp):"r"(a));
+  __asm __volatile ("clz %0, %1":"=r"(tmp):"r"(a_32));
 
   return (int16_t)(tmp - 17);
 }
diff --git a/webrtc/common_audio/signal_processing/signal_processing_unittest.cc b/webrtc/common_audio/signal_processing/signal_processing_unittest.cc
index 305789e2aa..12b2fffbee 100644
--- a/webrtc/common_audio/signal_processing/signal_processing_unittest.cc
+++ b/webrtc/common_audio/signal_processing/signal_processing_unittest.cc
@@ -106,6 +106,11 @@ TEST_F(SplTest, InlineTest) {
     EXPECT_EQ(15, WebRtcSpl_NormW16(-1));
     EXPECT_EQ(0, WebRtcSpl_NormW16(WEBRTC_SPL_WORD16_MIN));
     EXPECT_EQ(4, WebRtcSpl_NormW16(b32));
+    for (int ii = 0; ii < 15; ++ii) {
+      int16_t value = 1 << ii;
+      EXPECT_EQ(14 - ii, WebRtcSpl_NormW16(value));
+      EXPECT_EQ(15 - ii, WebRtcSpl_NormW16(-value));
+    }
 
     EXPECT_EQ(0, WebRtcSpl_NormU32(0u));
     EXPECT_EQ(0, WebRtcSpl_NormU32(0xffffffff));