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-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "cnss2: Check CNSS_MHI_POWER_OFF state in cnss_pci_suspend_bus()"

Browse source
This commit is contained in:
qctecmdr 2021-03-11 21:11:06 -08:00 • committed by Gerrit - the friendly Code Review server
commit 695867227f
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1571,12 +1571,15 @@ static void cnss_pci_set_mhi_state_bit(struct cnss_pci_data *pci_priv,
clear_bit(CNSS_MHI_INIT, &pci_priv->mhi_state);
break;
case CNSS_MHI_POWER_ON:
clear_bit(CNSS_MHI_POWER_OFF, &pci_priv->mhi_state);
set_bit(CNSS_MHI_POWER_ON, &pci_priv->mhi_state);
break;
case CNSS_MHI_POWERING_OFF:
set_bit(CNSS_MHI_POWERING_OFF, &pci_priv->mhi_state);
break;
case CNSS_MHI_POWER_OFF:
set_bit(CNSS_MHI_POWER_OFF, &pci_priv->mhi_state);
fallthrough;
case CNSS_MHI_FORCE_POWER_OFF:
clear_bit(CNSS_MHI_POWER_ON, &pci_priv->mhi_state);
clear_bit(CNSS_MHI_POWERING_OFF, &pci_priv->mhi_state);
@ -3031,7 +3034,8 @@ int cnss_pci_suspend_bus(struct cnss_pci_data *pci_priv)
struct pci_dev *pci_dev = pci_priv->pci_dev;
int ret = 0;
if (pci_priv->pci_link_state == PCI_LINK_DOWN)
if (pci_priv->pci_link_state == PCI_LINK_DOWN ||
test_bit(CNSS_MHI_POWER_OFF, &pci_priv->mhi_state))
goto out;
if (cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_SUSPEND)) {