diff --git a/bsp/CME_M7/StdPeriph_Driver/src/cmem7_can.c b/bsp/CME_M7/StdPeriph_Driver/src/cmem7_can.c
index d631e79c0d9bffe7a11234dec616ec17681455b6..bc261bf1639331c92558686001a68fa974f05978 100644
--- a/bsp/CME_M7/StdPeriph_Driver/src/cmem7_can.c
+++ b/bsp/CME_M7/StdPeriph_Driver/src/cmem7_can.c
@@ -185,7 +185,6 @@ BOOL CAN_Init(CAN0_Type* CANx, CAN_InitTypeDef* Init,
         uint8_t tmp;
         CANx->INT_EN &= ~CAN_INT_All;
         tmp = CANx->INT;
-        tmp = tmp;
     }
 
     CANx->MODE_b.LOM = (Init->CAN_TxEn) ? FALSE : TRUE;
diff --git a/bsp/CME_M7/StdPeriph_Driver/src/cmem7_i2c.c b/bsp/CME_M7/StdPeriph_Driver/src/cmem7_i2c.c
index 8d60b9ffe40c2ad852d251a3b04d30114e142d8d..87ca00d372ad8fa3930ab724e13689d8be82f405 100644
--- a/bsp/CME_M7/StdPeriph_Driver/src/cmem7_i2c.c
+++ b/bsp/CME_M7/StdPeriph_Driver/src/cmem7_i2c.c
@@ -45,10 +45,15 @@ static uint32_t i2c_GetClock(I2C0_Type* I2Cx) {
     uint32_t dividor;
     assert_param(IS_I2C_ALL_PERIPH(I2Cx));
 
-    if ((uint32_t)I2Cx == (uint32_t)I2C0) {
-        dividor = GLOBAL_CTRL->CLK_SEL_0_b.I2C0_CLK;
-    } else if ((uint32_t)I2Cx == (uint32_t)I2C1) {
-        dividor = GLOBAL_CTRL->CLK_SEL_0_b.I2C1_CLK;
+    switch (I2Cx) {
+        case I2C0:
+            dividor = GLOBAL_CTRL->CLK_SEL_0_b.I2C0_CLK;
+            break;
+        case I2C1:
+            dividor = GLOBAL_CTRL->CLK_SEL_0_b.I2C1_CLK;
+            break;
+        default:
+            dividor = 0; // invalid parameter
     }
 
     return SYSTEM_CLOCK_FREQ / (1 << (dividor + 1));