summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2022-01-16 18:31:00 -0800
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2022-01-16 18:31:00 -0800
commitaeecf22e42fb1857552fd3cd846b8e7679f1e3e7 (patch)
treee46800dc2f51b5a441206aa03ca7d7343252a42f
parent45edbf733479053bb97caf86cbf982df96173351 (diff)
parent8c3c48cfcd8fa2c3426991806613068b318b6b07 (diff)
downloadmsm-extra-aeecf22e42fb1857552fd3cd846b8e7679f1e3e7.tar.gz
Merge android-msm-barbet-4.19-sc-qpr1 into android-msm-barbet-4.19-sc-v2android-12.1.0_r0.21android-12.1.0_r0.15android-msm-barbet-4.19-android12L
SBMerger: 410055097 Change-Id: I5391cae04af7410dcc81eacfe0af07db013db78e Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--asoc/msm-pcm-routing-v2.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c
index a704b570..d0ce8714 100644
--- a/asoc/msm-pcm-routing-v2.c
+++ b/asoc/msm-pcm-routing-v2.c
@@ -2376,6 +2376,11 @@ static void msm_pcm_routing_process_voice(u16 reg, u16 val, int set)
session_id = msm_pcm_routing_get_voc_sessionid(val);
+ if (!session_id) {
+ pr_err("%s: Invalid session_id %x\n", __func__, session_id);
+ return;
+ }
+
pr_debug("%s: FE DAI 0x%x session_id 0x%x\n",
__func__, val, session_id);