From 2c4d0310aaf2fc5d4e213978beb5332d616fed83 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Sirasanagandla Date: Wed, 13 Feb 2019 15:54:01 +0530 Subject: 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 --- core/hdd/src/wlan_hdd_driver_ops.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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); } -- cgit v1.2.3