msm: eva: port eva-kernel.lnx.2.0 changes

Change-Id: I3121f71a11c8a48081309ad46c04bedc6b6a3ca1
Signed-off-by: George Shen <[email protected]>

msm/eva/msm_cvp_buf.c

@@ -106,10 +106,12 @@ static void print_internal_buffer(u32 tag, const char *str,
 void print_cvp_buffer(u32 tag, const char *str, struct msm_cvp_inst *inst,
 		struct cvp_internal_buf *cbuf)
 {
-	if (!inst || !cbuf)
+	if (!inst || !cbuf) {
 		dprintk(CVP_ERR,
 			"%s Invalid params inst %pK, cbuf %pK\n",
 			str, inst, cbuf);
+		return;
+	}
 
 	print_smem(tag, str, inst, cbuf->smem);
 }
@@ -1272,9 +1274,6 @@ static struct msm_cvp_smem *msm_cvp_session_get_smem(struct msm_cvp_inst *inst,
 		goto exit2;
 	}
 
-	if (smem->fd != buf->fd)
-		dprintk(CVP_ERR, "%s Failed fd check\n", __func__);
-
 	return smem;
 
 exit2:

msm/eva/msm_cvp_dsp.c

@@ -366,6 +366,11 @@ static struct cvp_dsp_fastrpc_driver_entry *pop_frpc_node(void)
 
 search_again:
 	ptr = &me->fastrpc_driver_list.list;
+	if (!ptr) {
+		frpc_node = NULL;
+		goto exit;
+	}
+
 	mutex_lock(&me->fastrpc_driver_list.lock);
 	list_for_each_safe(ptr, next, &me->fastrpc_driver_list.list) {
 		frpc_node = list_entry(ptr,
@@ -563,6 +568,8 @@ static void cvp_remove_dsp_sessions(void)
 
 	while ((frpc_node = pop_frpc_node())) {
 		s = &frpc_node->dsp_sessions.list;
+		if (!s)
+			return;
 		list_for_each_safe(s, next_s,
 				&frpc_node->dsp_sessions.list) {
 			inst = list_entry(s, struct msm_cvp_inst,