mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 23:24:22 -04:00
Merge "cnss2: Assert for recovery if there is already a recovery going on"
This commit is contained in:
commit
4def047588
1 changed files with 3 additions and 1 deletions
|
|
@ -1062,6 +1062,7 @@ static int cnss_driver_recovery_hdlr(struct cnss_plat_data *plat_priv,
|
|||
|
||||
if (test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state)) {
|
||||
cnss_pr_err("Recovery is already in progress\n");
|
||||
CNSS_ASSERT(0);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1114,7 +1115,8 @@ void cnss_schedule_recovery(struct device *dev,
|
|||
struct cnss_recovery_data *data;
|
||||
int gfp = GFP_KERNEL;
|
||||
|
||||
cnss_bus_update_status(plat_priv, CNSS_FW_DOWN);
|
||||
if (!test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state))
|
||||
cnss_bus_update_status(plat_priv, CNSS_FW_DOWN);
|
||||
|
||||
if (test_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state) ||
|
||||
test_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue