Merge "qcacld-3.0: set modules_inprogress only when modules state is < 3" into wlan-cld3.driver.lnx.2.0

This commit is contained in:
CNSS_WLAN Service 2017-11-29 09:37:25 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2fc18552e3

View file

@ -2320,6 +2320,13 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx,
qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work);
mutex_lock(&hdd_ctx->iface_change_lock);
if (hdd_ctx->driver_status == DRIVER_MODULES_ENABLED) {
mutex_unlock(&hdd_ctx->iface_change_lock);
hdd_info("Driver modules already Enabled");
EXIT();
return 0;
}
hdd_ctx->start_modules_in_progress = true;
switch (hdd_ctx->driver_status) {
@ -2458,9 +2465,6 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx,
hdd_info("Driver Modules Successfully Enabled");
hdd_ctx->driver_status = DRIVER_MODULES_ENABLED;
break;
case DRIVER_MODULES_ENABLED:
hdd_info("Driver modules already Enabled");
break;
default:
hdd_err("WLAN start invoked in wrong state! :%d\n",
hdd_ctx->driver_status);