diff --git a/3rd-party/bluedroid/decoder/srce/decoder-sbc.c b/3rd-party/bluedroid/decoder/srce/decoder-sbc.c
index 012dcc464..2b79f5bf8 100644
--- a/3rd-party/bluedroid/decoder/srce/decoder-sbc.c
+++ b/3rd-party/bluedroid/decoder/srce/decoder-sbc.c
@@ -121,12 +121,12 @@ static OI_STATUS DecodeBody(OI_CODEC_SBC_DECODER_CONTEXT *context,
     /*
      * Based on the header data, make sure that there is enough room to write the output samples.
      */
-    if (*pcmBytes < (sizeof(OI_INT16) * frameSamples * context->common.pcmStride) && !allowPartial) {
+    if ((*pcmBytes < (sizeof(OI_INT16) * frameSamples * context->common.pcmStride)) && !allowPartial) {
         /* If we're not allowing partial decodes, we need room for the entire
          * codec frame */
         TRACE(("-OI_CODEC_SBC_Decode: OI_CODEC_SBC_NOT_ENOUGH_AUDIO_DATA"));
         return OI_CODEC_SBC_NOT_ENOUGH_AUDIO_DATA;
-    } else if (*pcmBytes < sizeof (OI_INT16) * context->common.frameInfo.nrof_subbands * context->common.pcmStride) {
+    } else if (*pcmBytes < (sizeof (OI_INT16) * context->common.frameInfo.nrof_subbands * context->common.pcmStride)) {
         /* Even if we're allowing partials, we can still only decode on a frame
          * boundary */
         return OI_CODEC_SBC_NOT_ENOUGH_AUDIO_DATA;
diff --git a/src/l2cap.c b/src/l2cap.c
index 3bcd0483d..4c901bf9e 100644
--- a/src/l2cap.c
+++ b/src/l2cap.c
@@ -2525,7 +2525,7 @@ static void l2cap_signaling_handle_configure_request(l2cap_channel_t *channel, u
             channelStateVarSetFlag(channel, L2CAP_CHANNEL_STATE_VAR_SEND_CONF_RSP_MTU);
         }
         // Flush timeout { type(8):2, len(8): 2, Flush Timeout(16)}
-        if (option_type == L2CAP_CONFIG_OPTION_TYPE_FLUSH_TIMEOUT && (length == 2)){
+        if ((option_type == L2CAP_CONFIG_OPTION_TYPE_FLUSH_TIMEOUT) && (length == 2)){
             channel->flush_timeout = little_endian_read_16(command, pos);
             log_info("Flush timeout: %u ms", channel->flush_timeout);
         }