mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge tag 'LA.UM.9.14.r1-25800-LAHAINA.QSSI15.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina
"LA.UM.9.14.r1-25800-LAHAINA.QSSI15.0" * tag 'LA.UM.9.14.r1-25800-LAHAINA.QSSI15.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4: msm: eva: Validating the SFR buffer size before accessing msm: eva: Copy back the validated size to avoid security issue msm: npu: Fix use after free issue USB: dwc3: gadget: Add stop transfer request for isoc transfers arm64: defconfig: Enable uvc for QCM6490 IOT target firmware: qcom_scm: do not clear dump mode from shutdown msm: virtio_npu: Fix use-after-free issue in unmap_buf msm: virtio_npu: Fix use-after-free issue in virt_npu_map_buf i2c: i2c-master-msm-geni: add null pointer check in event call back firmware: qcom_scm: handle echo b > /proc/sysrq-trigger scripts: mod: replace with a safe function msm: ep_pcie: Disable hot reset and ignore linkdown coresight-tmc: Replace deprecated function USB: dwc3: gadget: Queue data for 16 micro frames ahead in future power: reset: Disable support of dynamic download mode (ramdump) Conflicts: arch/arm64/boot/dts/vendor/bindings/sound/rt5645.txt Change-Id: I57c063465c2804c77c5a6f62acb6c7987a38bc7f
This commit is contained in:
commit
b964d75b7e
19 changed files with 44962 additions and 44764 deletions
|
|
@ -1,7 +1,7 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
* Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/clk.h>
|
||||
|
|
@ -452,8 +452,16 @@ irqret:
|
|||
static void gi2c_ev_cb(struct dma_chan *ch, struct msm_gpi_cb const *cb_str,
|
||||
void *ptr)
|
||||
{
|
||||
struct geni_i2c_dev *gi2c = ptr;
|
||||
u32 m_stat = cb_str->status;
|
||||
struct geni_i2c_dev *gi2c;
|
||||
u32 m_stat;
|
||||
|
||||
if (!ptr || !cb_str) {
|
||||
pr_err("%s: Invalid ev_cb buffer\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
gi2c = (struct geni_i2c_dev *)ptr;
|
||||
m_stat = cb_str->status;
|
||||
|
||||
switch (cb_str->cb_event) {
|
||||
case MSM_GPI_QUP_ERROR:
|
||||
|
|
|
|||
Loading…
Reference in a new issue