mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
Merge "cnss2: Always collect dump if detect FW assert during shutdown"
This commit is contained in:
commit
8ef378700d
1 changed files with 2 additions and 13 deletions
|
|
@ -2048,18 +2048,6 @@ force_wake_put:
|
|||
cnss_pci_force_wake_put(pci_priv);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CNSS2_DEBUG
|
||||
static void cnss_pci_collect_dump(struct cnss_pci_data *pci_priv)
|
||||
{
|
||||
cnss_pci_collect_dump_info(pci_priv, false);
|
||||
CNSS_ASSERT(0);
|
||||
}
|
||||
#else
|
||||
static void cnss_pci_collect_dump(struct cnss_pci_data *pci_priv)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
static int cnss_qca6174_powerup(struct cnss_pci_data *pci_priv)
|
||||
{
|
||||
int ret = 0;
|
||||
|
|
@ -2253,7 +2241,8 @@ static int cnss_qca6290_shutdown(struct cnss_pci_data *pci_priv)
|
|||
test_bit(CNSS_IN_COLD_BOOT_CAL, &plat_priv->driver_state)) &&
|
||||
test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state)) {
|
||||
del_timer(&pci_priv->dev_rddm_timer);
|
||||
cnss_pci_collect_dump(pci_priv);
|
||||
cnss_pci_collect_dump_info(pci_priv, false);
|
||||
CNSS_ASSERT(0);
|
||||
}
|
||||
|
||||
if (!cnss_is_device_powered_on(plat_priv)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue