From 5a26dae6d0ba7d2fd0872747751c7e6f263345e9 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Thu, 15 Nov 2018 10:08:42 -0800 Subject: [PATCH] qcacld-3.0: Don't stop transition in ssr shutdown During sub-system recovery, the platform driver invokes the wlan's shutdown and reinit callbacks. Reinit is called regardless of the result of shutdown. Currently, the SSR transition is aborted in shutdown in the event of a failure. This results in a panic during reinit, which expects to be protected by that transition. Regardless of the result of shutdown, do not stop the SSR transition such that the entire recovery process is properly protected. Change-Id: I3685920de5a7d47f6334bf4d8389cb267a46fac2 CRs-Fixed: 2350868 --- core/hdd/src/wlan_hdd_driver_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 20cdc5fad217..0b149b284edd 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -794,7 +794,7 @@ unlock: hdd_stop_driver_ops_timer(); mutex_unlock(&hdd_init_deinit_lock); - dsc_psoc_trans_stop(hdd_psoc->dsc_psoc); + /* SSR transition is concluded at the end of soc re-init */ } /**