From d9e65f7fa127746f4deabd3cbc223f56ee21029a Mon Sep 17 00:00:00 2001 From: Mister Oyster Date: Sat, 8 Apr 2017 15:25:38 +0200 Subject: wifi: fix merge --- drivers/misc/mediatek/connectivity/common/combo/core/wmt_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/misc/mediatek/connectivity/common/combo/core/wmt_conf.c b/drivers/misc/mediatek/connectivity/common/combo/core/wmt_conf.c index 6c362398a..97ca24434 100644 --- a/drivers/misc/mediatek/connectivity/common/combo/core/wmt_conf.c +++ b/drivers/misc/mediatek/connectivity/common/combo/core/wmt_conf.c @@ -416,6 +416,8 @@ INT32 wmt_conf_read_file(VOID) osal_memset(&gDevWmt.rWmtGenConf, 0, osal_sizeof(gDevWmt.rWmtGenConf)); osal_memset(&gDevWmt.pWmtCfg, 0, osal_sizeof(gDevWmt.pWmtCfg)); + osal_memset(&gDevWmt.cWmtcfgName[0], 0, osal_sizeof(gDevWmt.cWmtcfgName)); + osal_strncpy(&(gDevWmt.cWmtcfgName[0]), CUST_CFG_WMT, osal_sizeof(CUST_CFG_WMT)); if (!osal_strlen(&(gDevWmt.cWmtcfgName[0]))) { -- cgit v1.2.3