diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-04-08 15:25:38 +0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:35:28 +0200 |
| commit | d9e65f7fa127746f4deabd3cbc223f56ee21029a (patch) | |
| tree | 4f5fb373ea7bf78f643ca79264623269157e01af /drivers | |
| parent | 15ee9d99dbb5d21c750c624d4ed795eff1960740 (diff) | |
wifi: fix merge
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/mediatek/connectivity/common/combo/core/wmt_conf.c | 2 |
1 files changed, 2 insertions, 0 deletions
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]))) { |