diff --git a/hal/hal_mp.c b/hal/hal_mp.c
index 4f53504..f7d8618 100644
--- a/hal/hal_mp.c
+++ b/hal/hal_mp.c
@@ -985,8 +985,9 @@ void mpt_SetRFPath_8812A(PADAPTER pAdapter)
 	}
 
 	switch (ulAntennaRx) {
-		u32 reg0xC50 = 0;
+		u32 reg0xC50;
 	case ANTENNA_A:
+		reg0xC50 = 0;
 		PHY_SetBBReg(pAdapter, rRxPath_Jaguar, bMaskByte0, 0x11);
 		PHY_SetRFReg(pAdapter, ODM_RF_PATH_B, RF_AC_Jaguar, 0xF0000, 0x1); /*/ RF_B_0x0[19:16] = 1, Standby mode*/
 		PHY_SetBBReg(pAdapter, rCCK_RX_Jaguar, bCCK_RX_Jaguar, 0x0);
@@ -1013,6 +1014,7 @@ void mpt_SetRFPath_8812A(PADAPTER pAdapter)
 		}
 		break;
 	case ANTENNA_B:
+		reg0xC50 = 0;
 		PHY_SetBBReg(pAdapter, rRxPath_Jaguar, bMaskByte0, 0x22);
 		PHY_SetRFReg(pAdapter, ODM_RF_PATH_A, RF_AC_Jaguar, 0xF0000, 0x1);/*/ RF_A_0x0[19:16] = 1, Standby mode */
 		PHY_SetBBReg(pAdapter, rCCK_RX_Jaguar, bCCK_RX_Jaguar, 0x1);
diff --git a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c
index 7e9d39a..fa8ba7b 100644
--- a/os_dep/linux/wifi_regd.c
+++ b/os_dep/linux/wifi_regd.c
@@ -12,7 +12,7 @@
 
 void rtw_reg_notify_by_driver(_adapter *adapter)
 {
-	return 0;
+	return;
 }
 
 int rtw_regd_init(_adapter *padapter)