summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>2019-02-13 15:54:01 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2019-02-14 00:55:49 -0800
commit2c4d0310aaf2fc5d4e213978beb5332d616fed83 (patch)
treec48f958cc91010a1d41d6052b53b3fbb585f2886
parent3fe833dd9104dbc336a78e98286552b224842f81 (diff)
qcacld-3.0: Clear driver recovery flag in probe start
During wlan driver load, if PLD_RECOVERY event is received from platform driver before invocation of wlan_hdd_pld_probe() then reg_notifier() callback from cfg80211 is not processed during wlan startup and causing failure of subsequent country settings. To address this, clear CDS_DRIVER_STATE_RECOVERING at the beginning of probe execution. Change-Id: I5e807658751f1f0eb4236516473d71949a305af8 CRs-Fixed: 2398696
-rw-r--r--core/hdd/src/wlan_hdd_driver_ops.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index 5ea6188a20ab..9591ca930787 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2019 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -1157,6 +1157,12 @@ static int wlan_hdd_pld_probe(struct device *dev,
return -EINVAL;
}
+ /*
+ * If PLD_RECOVERY is received before probe then clear
+ * CDS_DRIVER_STATE_RECOVERING.
+ */
+ cds_set_recovery_in_progress(false);
+
return wlan_hdd_probe(dev, bdev, id, bus_type, false);
}