lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Move clearing recovery flag to after platform driver callback

Browse Source 
Platform driver is still doing MHI cleanup at the current location of
clearing the recovery flag. Clear it after platform driver callback.

Change-Id: Ifa81950790fa3d2704ed1aed85301a99c6383470
CRs-Fixed: 2526873
This commit is contained in:
Alan Chen 2019-09-12 15:45:21 -07:00 committed by nshrivas
parent 5073f0c2c3
commit 50582ca9cb
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/hdd/src/wlan_hdd_main.c
View File

@ -9764,8 +9764,6 @@ int hdd_psoc_idle_shutdown(struct device *dev)
else
ret = __hdd_psoc_idle_shutdown(hdd_ctx);
cds_set_recovery_in_progress(false);
return ret;
}
@ -9838,6 +9836,10 @@ static void hdd_psoc_idle_timeout_callback(void *priv)
hdd_debug("System suspend in progress. Restart idle shutdown timer");
hdd_psoc_idle_timer_start(hdd_ctx);
}
/* Clear the recovery flag for PCIe discrete soc after idle shutdown*/
if (PLD_BUS_TYPE_PCIE == pld_get_bus_type(hdd_ctx->parent_dev))
cds_set_recovery_in_progress(false);
}
#ifdef WLAN_LOGGING_SOCK_SVC_ENABLE

7
core/pld/inc/pld_common.h
View File

@ -733,4 +733,11 @@ static inline int pld_nbuf_pre_alloc_free(struct sk_buff *skb)
return 0;
}
#endif
/**
* pld_get_bus_type() - Bus type of the device
* @dev: device
*
* Return: PLD bus type
*/
enum pld_bus_type pld_get_bus_type(struct device *dev);
#endif

2
core/pld/src/pld_common.c
View File

@ -200,7 +200,7 @@ static struct dev_node *pld_get_dev_node(struct device *dev)
*
* Return: PLD bus type
*/
static enum pld_bus_type pld_get_bus_type(struct device *dev)
enum pld_bus_type pld_get_bus_type(struct device *dev)
{
struct dev_node *dev_node = pld_get_dev_node(dev);