Merge 8168f4e0d5 on remote branch

Change-Id: Idb927d44c0a6cd5e3b8c8020ff7aafcc106a28e0
This commit is contained in:
Linux Build Service Account 2024-09-11 06:16:32 -07:00
commit ca5dc8ec8d
2 changed files with 14 additions and 2 deletions

View File

@ -8172,6 +8172,12 @@ static int fastrpc_cb_probe(struct device *dev)
for (j = 1; j < sharedcb_count &&
chan->sesscount < NUM_SESSIONS; j++) {
chan->sesscount++;
VERIFY(err, chan->sesscount < NUM_SESSIONS);
if (err) {
ADSPRPC_WARN("failed to add shared session, maximum sessions (%d) reached \n",
NUM_SESSIONS);
break;
}
dup_sess = &chan->session[chan->sesscount];
memcpy(dup_sess, sess,
sizeof(struct fastrpc_session_ctx));

View File

@ -385,7 +385,10 @@ TRACE_EVENT(fastrpc_msg,
memcpy(__get_str(buf), (message), (sizeof(message) - 1));
__get_str(buf)[sizeof(message) - 1] = '\0';
#else
__assign_str(buf, message);
if (message)
__assign_str_len(buf, message, (sizeof(message) - 1));
else
memcpy(__get_str(buf), "(null)", sizeof("(null)"));
#endif
),
TP_printk(" %s", __get_str(buf))
@ -410,7 +413,10 @@ TRACE_EVENT(fastrpc_dspsignal,
memcpy(__get_str(buf), (event), (sizeof(event) - 1));
__get_str(buf)[sizeof(event) - 1] = '\0';
#else
__assign_str(buf, event);
if (event)
__assign_str_len(buf, event, (sizeof(event) - 1));
else
memcpy(__get_str(buf), "(null)", sizeof("(null)"));
#endif
__entry->signal_id = signal_id;
__entry->state = state;