Merge "cnss2: Use driver status flag for QCA6174 SSR" (d044c402) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/cnss2/main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -555,7 +555,7 @@ static int cnss_qca6174_powerup(struct cnss_plat_data *plat_priv)
		ret);
		goto suspend_link;
		}
		} else if (plat_priv->recovery_in_progress) {
		} else if (plat_priv->driver_status == CNSS_RECOVERY) {
		ret = plat_priv->driver_ops->reinit(pci_priv->pci_dev,
		pci_priv->pci_device_id);
		if (ret) {
		@@ -563,7 +563,7 @@ static int cnss_qca6174_powerup(struct cnss_plat_data *plat_priv)
		ret);
		goto suspend_link;
		}
		plat_priv->recovery_in_progress = false;
		plat_priv->driver_status = CNSS_INITIALIZED;
		} else {
		cnss_pr_err("Driver state is not correct to power up!\n");
		ret = -EINVAL;
		@@ -596,7 +596,7 @@ static int cnss_qca6174_shutdown(struct cnss_plat_data *plat_priv)
		cnss_pci_set_monitor_wake_intr(pci_priv, false);
		cnss_pci_set_auto_suspended(pci_priv, 0);
		} else {
		plat_priv->recovery_in_progress = true;
		plat_priv->driver_status = CNSS_RECOVERY;
		plat_priv->driver_ops->shutdown(pci_priv->pci_dev);
		}