Merge "icnss: Clear ignore_qmi_timeout flag at server arrive" (15cf7b2c) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/soc/qcom/icnss.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -782,6 +782,7 @@ static int icnss_driver_event_server_arrive(void *data)

		set_bit(ICNSS_WLFW_EXISTS, &penv->state);
		clear_bit(ICNSS_FW_DOWN, &penv->state);
		icnss_ignore_fw_timeout(false);

		ret = icnss_connect_to_fw_server(penv, data);
		if (ret)
		@@ -1100,8 +1101,10 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv,
		int ret = 0;
		struct icnss_event_pd_service_down_data *event_data = data;

		if (!test_bit(ICNSS_WLFW_EXISTS, &priv->state))
		if (!test_bit(ICNSS_WLFW_EXISTS, &priv->state)) {
		icnss_ignore_fw_timeout(false);
		goto out;
		}

		if (priv->force_err_fatal)
		ICNSS_ASSERT(0);
		@@ -1125,8 +1128,6 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv,
		out:
		kfree(data);

		icnss_ignore_fw_timeout(false);

		return ret;
		}

		@@ -1135,15 +1136,16 @@ static int icnss_driver_event_early_crash_ind(struct icnss_priv *priv,
		{
		int ret = 0;

		if (!test_bit(ICNSS_WLFW_EXISTS, &priv->state))
		if (!test_bit(ICNSS_WLFW_EXISTS, &priv->state)) {
		icnss_ignore_fw_timeout(false);
		goto out;
		}

		priv->early_crash_ind = true;
		icnss_fw_crashed(priv, NULL);

		out:
		kfree(data);
		icnss_ignore_fw_timeout(false);

		return ret;
		}