From 80fb30c778d4cfc69897d56d6f5e395fdbf7fb19 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Mon, 29 Apr 2019 15:11:40 -0700 Subject: [PATCH] qcacld-3.0: Remove PSOC sync protection for runtime PM resume Unlike runtime PM suspend, resume may need happen synchronously during driver shutdown or idle shutdown, hence remove PSOC sync protection for runtime PM resume. Change-Id: I4112215d3415dbe6da225d8feb2af7207d88753a CRs-fixed: 2451994 --- core/hdd/src/wlan_hdd_driver_ops.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index e86029a20fce..d9d4e45b8b52 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -1698,18 +1698,11 @@ static int wlan_hdd_pld_runtime_suspend(struct device *dev, static int wlan_hdd_pld_runtime_resume(struct device *dev, enum pld_bus_type bus_type) { - struct osif_psoc_sync *psoc_sync; - int errno; - - errno = osif_psoc_sync_op_start(dev, &psoc_sync); - if (errno) - return errno; - - errno = wlan_hdd_runtime_resume(dev); - - osif_psoc_sync_op_stop(psoc_sync); - - return errno; + /* As opposite to suspend, Runtime PM resume can happen + * synchronously during driver shutdown or idle shutown, + * so remove PSOC sync protection here. + */ + return wlan_hdd_runtime_resume(dev); } #endif