Merge 811b817abf on remote branch

Change-Id: I12e482a4ca9087d58e0b1aaa4655ddd8d8394db1
This commit is contained in:
Linux Build Service Account 2022-12-05 22:28:00 -08:00
commit 949b287950
2 changed files with 8 additions and 2 deletions

View file

@ -1398,6 +1398,11 @@ static ssize_t ipa3_read_odlstats(struct file *file, char __user *ubuf,
int nbytes;
int cnt = 0;
if (!ipa3_odl_ctx) {
IPADBG("ODL stats not supported\n");
return 0;
}
nbytes = scnprintf(dbg_buff, IPA_MAX_MSG_LEN,
"ODL received pkt =%u\n"
"ODL processed pkt to DIAG=%u\n"

View file

@ -2,6 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/delay.h>
@ -2146,8 +2147,8 @@ begin:
goto fail_kmem_cache_alloc;
rx_pkt = ipa3_alloc_rx_pkt_page(GFP_KERNEL, true);
if (unlikely(!rx_pkt)) {
IPAERR("ipa3_alloc_rx_pkt_page fails\n");
break;
IPAERR_RL("ipa3_alloc_rx_pkt_page fails\n");
goto fail_kmem_cache_alloc;
}
rx_pkt->sys = sys;
sys->repl->cache[curr] = rx_pkt;