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

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

Merge "msm: ipa3: Fix Q6 resourse manager de-init"

parents 6c676245 b6b594be

drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c

+7 −2
Original line number Diff line number Diff line
@@ -1828,6 +1828,8 @@ void q6_deinitialize_rm(void) 
	if (ret < 0)

		IPAWANERR("Error deleting resource %d, ret=%d\n",

			IPA_RM_RESOURCE_Q6_PROD, ret);



	if (ipa_rm_q6_workqueue)

		destroy_workqueue(ipa_rm_q6_workqueue);

}
@@ -2108,7 +2110,10 @@ timer_init_err: 
		IPAWANERR("Error deleting resource %d, ret=%d\n",

		IPA_RM_RESOURCE_WWAN_0_PROD, ret);

create_rsrc_err:



	if (!atomic_read(&is_ssr))

		q6_deinitialize_rm();



q6_init_err:

	free_netdev(ipa_netdevs[0]);

	ipa_netdevs[0] = NULL;

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

+7 −2
Original line number Diff line number Diff line
@@ -1911,6 +1911,8 @@ void ipa3_q6_deinitialize_rm(void) 
	if (ret < 0)

		IPAWANERR("Error deleting resource %d, ret=%d\n",

			IPA_RM_RESOURCE_Q6_PROD, ret);



	if (rmnet_ipa3_ctx->rm_q6_wq)

		destroy_workqueue(rmnet_ipa3_ctx->rm_q6_wq);

}
@@ -2225,7 +2227,10 @@ timer_init_err: 
		IPAWANERR("Error deleting resource %d, ret=%d\n",

		IPA_RM_RESOURCE_WWAN_0_PROD, ret);

create_rsrc_err:



	if (!atomic_read(&rmnet_ipa3_ctx->is_ssr))

		ipa3_q6_deinitialize_rm();



q6_init_err:

	free_netdev(dev);

	rmnet_ipa3_ctx->wwan_priv = NULL;