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

Commit d96627d1 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Do not send FW_DOWN to WLAN host driver"

parents 48168c52 d3192dd5

drivers/net/wireless/cnss2/main.c

+1 −1
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ static int cnss_fw_ready_hdlr(struct cnss_plat_data *plat_priv) 


	del_timer(&plat_priv->fw_boot_timer);

	set_bit(CNSS_FW_READY, &plat_priv->driver_state);

	clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);



	if (test_bit(CNSS_FW_BOOT_RECOVERY, &plat_priv->driver_state)) {

		clear_bit(CNSS_FW_BOOT_RECOVERY, &plat_priv->driver_state);
@@ -901,7 +902,6 @@ static int cnss_do_recovery(struct cnss_plat_data *plat_priv, 
		break;

	case CNSS_REASON_RDDM:

		cnss_bus_collect_dump_info(plat_priv, false);

		clear_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);

		break;

	case CNSS_REASON_DEFAULT:

	case CNSS_REASON_TIMEOUT:

drivers/net/wireless/cnss2/pci.c

+0 −4
Original line number Diff line number Diff line
@@ -2025,10 +2025,6 @@ static void cnss_mhi_notify_status(struct mhi_controller *mhi_ctrl, void *priv, 
		return;

	}



	if (pci_priv->driver_ops && pci_priv->driver_ops->update_status)

		pci_priv->driver_ops->update_status(pci_priv->pci_dev,

						    CNSS_FW_DOWN);



	switch (reason) {

	case MHI_CB_EE_RDDM:

		cnss_reason = CNSS_REASON_RDDM;