Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df42349 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Deinit MHI before device power on during SSR"

parents 276828e6 1f8800f7

drivers/net/wireless/cnss2/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1100,7 +1100,8 @@ static int cnss_qca6290_powerup(struct cnss_plat_data *plat_priv) 
		return -ENODEV;

	}



	if (plat_priv->ramdump_info_v2.dump_data_valid) {

	if (plat_priv->ramdump_info_v2.dump_data_valid ||

	    test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state)) {

		cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_DEINIT);

		cnss_pci_clear_dump_info(pci_priv);

	}

drivers/net/wireless/cnss2/pci.c

+6 −2
Original line number Diff line number Diff line
@@ -1392,7 +1392,11 @@ void cnss_pci_stop_mhi(struct cnss_pci_data *pci_priv) 


	cnss_pci_set_mhi_state_bit(pci_priv, CNSS_MHI_RESUME);

	cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_POWER_OFF);

	if (!plat_priv->ramdump_info_v2.dump_data_valid)



	if (plat_priv->ramdump_info_v2.dump_data_valid ||

	    test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state))

		return;



	cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_DEINIT);

}