diff --git a/ath_hal/ar5210/ar5210_reset.c b/ath_hal/ar5210/ar5210_reset.c
index 6a082e0..5e103a0 100644
--- a/ath_hal/ar5210/ar5210_reset.c
+++ b/ath_hal/ar5210/ar5210_reset.c
@@ -691,6 +691,7 @@ getGainF(struct ath_hal *ah, const struct tpcMap *pRD,
 			"%s: no valid entries in the pcdac table: %d\n",
 			__func__, pcdac);
 #endif
+		*dBm = 0;
 		return 63;
 	}
 	if (i >= AR_TP_SCALING_ENTRIES) {
diff --git a/ath_hal/ar5211/ar5211_beacon.c b/ath_hal/ar5211/ar5211_beacon.c
index 74207a3..83223f2 100644
--- a/ath_hal/ar5211/ar5211_beacon.c
+++ b/ath_hal/ar5211/ar5211_beacon.c
@@ -63,8 +63,7 @@ ar5211BeaconInit(struct ath_hal *ah,
 	 * interrupt; otherwise it sets the start of the next CFP.
 	 */
 	switch (AH_PRIVATE(ah)->ah_opmode) {
-	case HAL_M_STA:
-	case HAL_M_MONITOR:
+	default:
 		bt.bt_nextdba = 0xffff;
 		bt.bt_nextswba = 0x7ffff;
 		break;
diff --git a/ath_hal/ar5211/ar5211_reset.c b/ath_hal/ar5211/ar5211_reset.c
index f048a51..1290c26 100644
--- a/ath_hal/ar5211/ar5211_reset.c
+++ b/ath_hal/ar5211/ar5211_reset.c
@@ -1877,6 +1877,9 @@ ar5211GetLowerUpperValues(uint16_t value,
 			return;
 		}
 	}
+	HALASSERT(AH_FALSE);		/* should not reach here */
+	*pLowerValue = *pList;
+	*pUpperValue = *pList;
 }
 
 /*
diff --git a/ath_hal/ar5212/ar2316.c b/ath_hal/ar5212/ar2316.c
index c724a95..684099b 100644
--- a/ath_hal/ar5212/ar2316.c
+++ b/ath_hal/ar5212/ar2316.c
@@ -295,6 +295,8 @@ GetLowerUpperIndex(int16_t v, const uint16_t *lp, uint16_t listSize,
 			return;
 		}
 	}
+	HALASSERT(AH_FALSE);		/* should not reach here */
+	*vlo = *vhi = 0;
 }
 
 /*
diff --git a/ath_hal/ar5212/ar2317.c b/ath_hal/ar5212/ar2317.c
index c83cff0..90aca69 100644
--- a/ath_hal/ar5212/ar2317.c
+++ b/ath_hal/ar5212/ar2317.c
@@ -271,6 +271,8 @@ GetLowerUpperIndex(int16_t v, const uint16_t *lp, uint16_t listSize,
 			return;
 		}
 	}
+	HALASSERT(AH_FALSE);		/* should not reach here */
+	*vlo = *vhi = 0;
 }
 
 /*
diff --git a/ath_hal/ar5212/ar2413.c b/ath_hal/ar5212/ar2413.c
index a9e4686..b4b547b 100644
--- a/ath_hal/ar5212/ar2413.c
+++ b/ath_hal/ar5212/ar2413.c
@@ -289,6 +289,8 @@ GetLowerUpperIndex(int16_t v, const uint16_t *lp, uint16_t listSize,
 			return;
 		}
 	}
+	HALASSERT(AH_FALSE);		/* should not reach here */
+	*vlo = *vhi = 0;
 }
 
 /*
diff --git a/ath_hal/ar5212/ar2425.c b/ath_hal/ar5212/ar2425.c
index 611f493..29a3655 100644
--- a/ath_hal/ar5212/ar2425.c
+++ b/ath_hal/ar5212/ar2425.c
@@ -290,6 +290,8 @@ GetLowerUpperIndex(int16_t v, const uint16_t *lp, uint16_t listSize,
 			return;
 		}
 	}
+	HALASSERT(AH_FALSE);		/* should not reach here */
+	*vlo = *vhi = 0;
 }
 
 /*
diff --git a/ath_hal/ar5212/ar5212_beacon.c b/ath_hal/ar5212/ar5212_beacon.c
index 2dbc0cb..638e3ed 100644
--- a/ath_hal/ar5212/ar5212_beacon.c
+++ b/ath_hal/ar5212/ar5212_beacon.c
@@ -76,8 +76,7 @@ ar5212BeaconInit(struct ath_hal *ah,
 	 * interrupt; otherwise it sets the start of the next CFP.
 	 */
 	switch (AH_PRIVATE(ah)->ah_opmode) {
-	case HAL_M_STA:
-	case HAL_M_MONITOR:
+	default:
 		bt.bt_nextdba = 0xffff;
 		bt.bt_nextswba = 0x7ffff;
 		break;
diff --git a/ath_hal/ar5212/ar5212_reset.c b/ath_hal/ar5212/ar5212_reset.c
index d44a67e..186fefd 100644
--- a/ath_hal/ar5212/ar5212_reset.c
+++ b/ath_hal/ar5212/ar5212_reset.c
@@ -2525,6 +2525,7 @@ ar5212GetLowerUpperValues(uint16_t v, uint16_t *lp, uint16_t listSize,
 		}
 	}
 	HALASSERT(AH_FALSE);		/* should not reach here */
+	*vlo = *vhi = 0;
 }
 
 /*
diff --git a/ath_hal/ar5212/ar5413.c b/ath_hal/ar5212/ar5413.c
index a28a484..34031cd 100644
--- a/ath_hal/ar5212/ar5413.c
+++ b/ath_hal/ar5212/ar5413.c
@@ -324,6 +324,8 @@ GetLowerUpperIndex(int16_t v, const uint16_t *lp, uint16_t listSize,
 			return;
 		}
 	}
+	HALASSERT(AH_FALSE);		/* should not reach here */
+	*vlo = *vhi = 0;
 }
 
 /*