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-07 20:33:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "cnss2: Handle race between register driver and reboot properly"

Browse source
This commit is contained in:
qctecmdr 2020-04-11 13:28:34 -07:00 • committed by Gerrit - the friendly Code Review server
commit e3355ff92a
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2113,6 +2113,10 @@ register_driver:
CNSS_DRIVER_EVENT_REGISTER_DRIVER,
CNSS_EVENT_SYNC_UNINTERRUPTIBLE,
driver_ops);
if (ret == -EINTR) {
cnss_pr_dbg("Register driver work is killed\n");
del_timer(&plat_priv->fw_boot_timer);
}
return ret;
}
@ -2168,6 +2172,11 @@ int cnss_pci_register_driver_hdlr(struct cnss_pci_data *pci_priv,
int ret = 0;
struct cnss_plat_data *plat_priv = pci_priv->plat_priv;
if (test_bit(CNSS_IN_REBOOT, &plat_priv->driver_state)) {
cnss_pr_dbg("Reboot or shutdown is in progress, ignore register driver\n");
return -EINVAL;
}
set_bit(CNSS_DRIVER_LOADING, &plat_priv->driver_state);
pci_priv->driver_ops = data;