From ecfce63fdd5580dff43a337e1766b2ece243974c Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Tue, 13 Sep 2016 10:41:45 -0700 Subject: qcacld-3.0: Minor cleanup of previous PS timeout change Some cleanup is needed around a previous code change that reset the power save timeout when power save is requested from user space. Perform minor code cleanup, moving a logging statement and removing a blank line. Change-Id: Idc656fbaba16e58ef57625b5f9d5de37a191793a CRs-Fixed: 1066022 --- core/hdd/src/wlan_hdd_power.c | 4 ++-- core/sme/src/common/sme_power_save.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 3fef3a0035e9..443dee9ccf46 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -2008,14 +2008,14 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, QDF_STATUS qdf_status; int status; + ENTER(); + if (timeout < 0) { hdd_notice("User space timeout: %d; Using default instead: %d", timeout, AUTO_PS_ENTRY_USER_TIMER_DEFAULT_VALUE); timeout = AUTO_PS_ENTRY_USER_TIMER_DEFAULT_VALUE; } - ENTER(); - if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EINVAL; diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index c9a52fa49351..db484af101cc 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -982,7 +982,6 @@ tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) /** * sme_ps_enable_auto_ps_timer(): Enable power-save auto timer with timeout - * * @hal_ctx: HAL context * @session_id: adapter session Id * @timeout: timeout period in ms -- cgit v1.2.3