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

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

Merge "net: ipc_router: Initialize IPC Router security sub-module in core init"

parents 979a567d 995cfaeb

net/ipc_router/ipc_router_core.c

+7 −6
Original line number Diff line number Diff line
@@ -4116,6 +4116,7 @@ static struct platform_driver ipc_router_driver = { 
static int ipc_router_core_init(void)

{

	int i;

	int ret;

	struct msm_ipc_routing_table_entry *rt_entry;



	mutex_lock(&ipc_router_init_lock);
@@ -4148,10 +4149,14 @@ static int ipc_router_core_init(void) 
		return -ENOMEM;

	}



	ret = msm_ipc_router_security_init();

	if (ret < 0)

		IPC_RTR_ERR("%s: Security Init failed\n", __func__);

	else

		is_ipc_router_inited = true;

	mutex_unlock(&ipc_router_init_lock);



	return 0;

	return ret;

}



static int msm_ipc_router_init(void)
@@ -4162,10 +4167,6 @@ static int msm_ipc_router_init(void) 
	if (ret < 0)

		return ret;



	ret = msm_ipc_router_security_init();

	if (ret < 0)

		IPC_RTR_ERR("%s: Security Init failed\n", __func__);



	ret = platform_driver_register(&ipc_router_driver);

	if (ret)

		IPC_RTR_ERR(