A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 13:44:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Don't double start inactivity timer" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-10-17 12:53:46 -07:00 • committed by Gerrit - the friendly Code Review server
commit 74c216ca33
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/hdd/src/wlan_hdd_main.c
View file

@ -2557,6 +2557,8 @@ static int __hdd_open(struct net_device *dev)
mutex_lock(&hdd_init_deinit_lock);
hdd_start_driver_ops_timer(eHDD_DRV_OP_IFF_UP);
/*
* This scenario can be hit in cases where in the wlan driver after
* registering the netdevices and there is a failure in driver
@ -2607,6 +2609,7 @@ static int __hdd_open(struct net_device *dev)
hdd_populate_wifi_pos_cfg(hdd_ctx);
err_hdd_hdd_init_deinit_lock:
hdd_stop_driver_ops_timer();
mutex_unlock(&hdd_init_deinit_lock);
return ret;
}
@ -2625,9 +2628,7 @@ static int hdd_open(struct net_device *dev)
int ret;
cds_ssr_protect(__func__);
hdd_start_driver_ops_timer(eHDD_DRV_OP_IFF_UP);
ret = __hdd_open(dev);
hdd_stop_driver_ops_timer();
cds_ssr_unprotect(__func__);
return ret;