diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 90a14b49ea72..3777d8425bd4 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -53,7 +53,7 @@
 #endif
 
 /* Number of items that can be configured */
-#define MAX_CFG_INI_ITEMS   512
+#define MAX_CFG_INI_ITEMS   1024
 
 /* Defines for all of the things we read from the configuration (registry). */
 
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index 95bdb0722650..d3fd27f3f279 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -3916,11 +3916,10 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 	int i;
 	int rv;
 
-	/* sanity test */
 	if (MAX_CFG_INI_ITEMS < cRegTableEntries) {
-		hddLog(LOGE,
-		       "%s: MAX_CFG_INI_ITEMS too small, must be at least %ld",
-		       __func__, cRegTableEntries);
+		hddLog(LOGE, FL("MAX_CFG_INI_ITEMS too small, must be at least %ld"),
+		       cRegTableEntries);
+		WARN_ON(1);
 	}
 
 	for (idx = 0; idx < cRegTableEntries; idx++, pRegEntry++) {