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

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

Merge "drivers: qcom: ipc: Initialize PIL handle in error case" into msm-3.10

parents 8d324555 de5c5c76

drivers/soc/qcom/ipc_router_smd_xprt.c

+2 −0
Original line number Diff line number Diff line
@@ -578,6 +578,8 @@ static void pil_vote_load_worker(struct work_struct *work) 
				__func__, peripheral);

			vote_info->pil_handle = NULL;

		}

	} else {

		vote_info->pil_handle = NULL;

	}

}

net/ipc_router/ipc_router_socket.c

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ static int msm_ipc_router_create(struct net *net, 
	sk->sk_rcvtimeo = DEFAULT_RCV_TIMEO;



	msm_ipc_sk(sk)->port = port_ptr;

	msm_ipc_sk(sk)->default_node_vote_info = NULL;



	return 0;

}