Merge "cnss2: Clear flag CNSS_DRIVER_UNLOADING after unregister driver finished" (7f6b5aa0) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/wireless/cnss2/pci.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -401,8 +401,6 @@ static int cnss_qca6174_shutdown(struct cnss_pci_data *pci_priv)

		cnss_power_off_device(plat_priv);

		clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);

		return ret;
		}

		@@ -519,7 +517,6 @@ static int cnss_qca6290_shutdown(struct cnss_pci_data *pci_priv)

		clear_bit(CNSS_FW_READY, &plat_priv->driver_state);
		clear_bit(CNSS_FW_MEM_READY, &plat_priv->driver_state);
		clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);

		return ret;
		}
		@@ -760,6 +757,7 @@ int cnss_pci_unregister_driver_hdlr(struct cnss_pci_data *pci_priv)
		set_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);
		cnss_pci_dev_shutdown(pci_priv);
		pci_priv->driver_ops = NULL;
		clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);

		return 0;
		}