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

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

Merge "cnss2: Clear FW related status flags during shutdown"

parents c8a4959a a4f60d19

drivers/net/wireless/cnss2/main.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1149,6 +1149,9 @@ skip_driver_remove: 




	cnss_power_off_device(plat_priv);

	cnss_power_off_device(plat_priv);





	clear_bit(CNSS_FW_READY, &plat_priv->driver_state);

	clear_bit(CNSS_FW_MEM_READY, &plat_priv->driver_state);



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

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

		clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);

		clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);

		clear_bit(CNSS_DRIVER_PROBED, &plat_priv->driver_state);

		clear_bit(CNSS_DRIVER_PROBED, &plat_priv->driver_state);

drivers/net/wireless/cnss2/qmi.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -961,8 +961,6 @@ int cnss_wlfw_server_exit(struct cnss_plat_data *plat_priv) 
	qmi_handle_destroy(plat_priv->qmi_wlfw_clnt);

	qmi_handle_destroy(plat_priv->qmi_wlfw_clnt);

	plat_priv->qmi_wlfw_clnt = NULL;

	plat_priv->qmi_wlfw_clnt = NULL;





	clear_bit(CNSS_FW_READY, &plat_priv->driver_state);

	clear_bit(CNSS_FW_MEM_READY, &plat_priv->driver_state);

	clear_bit(CNSS_QMI_WLFW_CONNECTED, &plat_priv->driver_state);

	clear_bit(CNSS_QMI_WLFW_CONNECTED, &plat_priv->driver_state);





	cnss_pr_info("QMI WLFW service disconnected, state: 0x%lx\n",

	cnss_pr_info("QMI WLFW service disconnected, state: 0x%lx\n",