A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "cnss2: Wait for RDDM if device is already in bad state"

Browse source
This commit is contained in:
qctecmdr 2020-10-19 19:06:17 -07:00 • committed by Gerrit - the friendly Code Review server
commit 977809564c
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/wireless/cnss2/main.c
View file

@ -1321,13 +1321,13 @@ int cnss_force_collect_rddm(struct device *dev)
}
if (cnss_bus_is_device_down(plat_priv)) {
cnss_pr_info("Device is already in bad state, ignore force collect rddm\n");
return 0;
cnss_pr_info("Device is already in bad state, wait to collect rddm\n");
goto wait_rddm;
}
if (test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state)) {
cnss_pr_info("Recovery is already in progress, ignore forced collect rddm\n");
return 0;
cnss_pr_info("Recovery is already in progress, wait to collect rddm\n");
goto wait_rddm;
}
if (test_bit(CNSS_DRIVER_LOADING, &plat_priv->driver_state) ||
@ -1342,6 +1342,7 @@ int cnss_force_collect_rddm(struct device *dev)
if (ret)
return ret;
wait_rddm:
reinit_completion(&plat_priv->rddm_complete);
ret = wait_for_completion_timeout
(&plat_priv->rddm_complete,