joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "cnss2: Move updating WLAN host driver status to one place"

Browse source
This commit is contained in:
Linux Build Service Account 2018-11-01 13:26:11 -07:00 • committed by Gerrit - the friendly Code Review server
commit a7306e9161
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -994,6 +994,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 (in_interrupt() || irqs_disabled())
gfp = GFP_ATOMIC;

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

@ -223,7 +223,6 @@ int cnss_pci_link_down(struct device *dev)
cnss_pr_err("PCI link down is detected by host driver, schedule recovery!\n");
cnss_pci_update_status(pci_priv, CNSS_FW_DOWN);
cnss_schedule_recovery(dev, CNSS_REASON_LINK_DOWN);
return 0;
@ -910,8 +909,6 @@ static void cnss_pci_event_cb(struct msm_pcie_notify *notify)
cnss_pr_err("PCI link down, schedule recovery!\n");
if (pci_dev->device == QCA6174_DEVICE_ID)
disable_irq(pci_dev->irq);
cnss_pci_update_status(pci_priv, CNSS_FW_DOWN);
cnss_schedule_recovery(&pci_dev->dev, CNSS_REASON_LINK_DOWN);
break;
case MSM_PCIE_EVENT_WAKEUP:
@ -2049,7 +2046,6 @@ static void cnss_mhi_notify_status(struct mhi_controller *mhi_ctrl, void *priv,
set_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);
del_timer(&plat_priv->fw_boot_timer);
cnss_pci_update_status(pci_priv, CNSS_FW_DOWN);
cnss_schedule_recovery(&pci_priv->pci_dev->dev, cnss_reason);
}