diff options
| author | Prakash Dhavali <pdhavali@qca.qualcomm.com> | 2014-01-20 03:02:30 -0800 |
|---|---|---|
| committer | Prakash Dhavali <pdhavali@qca.qualcomm.com> | 2014-01-23 21:56:08 -0800 |
| commit | 79ca0446925a5d43d9c686a77ae6e2632dc3bd51 (patch) | |
| tree | 8b70f12c064d6028c30783ec200433e8cfe9ff93 | |
| parent | 866d959d6df4399820505991524b5aa5dab8618b (diff) | |
Revert "qcacld: Use correct values for power limits"
This reverts commit c24a3d08b5cec6c4d3cf9e2a97ab7e348accbee3
Issue with git patching seems to have resulted in change id mismatch. Revert this to resubmit a new change to match https://review-android.quicinc.com/#/c/577609/
Change-Id: Ia17a9012da01f49cd05de8a41f03280b765e2826
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg.c | 2 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_early_suspend.c | 2 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index e11709c553c8..a036d049c77b 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -4464,7 +4464,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) temp = (temp & 0xFFF3) | (pConfig->vhtTxMCS2x2 << 2); VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, - "vhtRxMCS2x2 - %x temp - %u enable2x2 %d\n", + "vhtRxMCS2x2 - %x temp - %lu enable2x2 %d\n", pConfig->vhtRxMCS2x2, temp, pConfig->enable2x2); if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_TX_MCS_MAP, diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c index a53597f58f5a..7bcc30198d7d 100644 --- a/CORE/HDD/src/wlan_hdd_early_suspend.c +++ b/CORE/HDD/src/wlan_hdd_early_suspend.c @@ -1707,7 +1707,7 @@ VOS_STATUS hdd_wlan_re_init(void *hif_sc) adf_ctx = vos_mem_malloc(sizeof(adf_os_device_t)); if (!adf_ctx) { - hddLog(VOS_TRACE_LEVEL_FATAL,"%s: Failed to allocate adf_ctx", __func__); + hddLog(VOS_TRACE_LEVEL_FATAL,"%s: Failed to allocate adf_ctx"); goto err_re_init; } vos_mem_zero(adf_ctx, sizeof(adf_os_device_t)); diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 74eba4c12ae7..31cd11df4f70 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -8554,8 +8554,8 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) adf_ctx = vos_mem_malloc(sizeof(*adf_ctx)); if (!adf_ctx) { - hddLog(VOS_TRACE_LEVEL_FATAL,"%s: Failed to allocate adf_ctx", __func__); - goto err_free_hdd_context; + hddLog(VOS_TRACE_LEVEL_FATAL,"%s: Failed to allocate adf_ctx"); + goto err_free_hdd_context; } vos_mem_zero(adf_ctx, sizeof(*adf_ctx)); #ifdef QCA_WIFI_ISOC |