Merge d8a1e7171efa1debaedadc439c3a7014f51e10ee on remote branch (6df8ae8d) · Commits · e / devices / android_kernel_oneplus_sm7250

dsp/q6adm.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -1592,17 +1592,12 @@ static int32_t adm_callback(struct apr_client_data data, void priv)
		if (data->opcode == APR_BASIC_RSP_RESULT) {
		pr_debug("%s: APR_BASIC_RSP_RESULT id 0x%x\n",
		__func__, payload[0]);

		if (!((client_id != ADM_CLIENT_ID_SOURCE_TRACKING) &&
		((payload[0] == ADM_CMD_SET_PP_PARAMS_V5) \|\|
		(payload[0] == ADM_CMD_SET_PP_PARAMS_V6)))) {
		if (data->payload_size <
		(2 * sizeof(uint32_t))) {
		pr_err("%s: Invalid payload size %d\n",
		__func__, data->payload_size);
		return 0;
		}
		}

		if (payload[1] != 0) {
		pr_err("%s: cmd = 0x%x returned error = 0x%x\n",

+7 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2013-2020, 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/fs.h>
		#include <linux/mutex.h>
		@@ -2036,6 +2036,12 @@ static int q6lsm_mmapcallback(struct apr_client_data data, void priv)
		return 0;
		}

		if (data->payload_size < (2 * sizeof(uint32_t))) {
		pr_err("%s: payload has invalid size[%d]\n", __func__,
		data->payload_size);
		return -EINVAL;
		}

		command = payload[0];
		retcode = payload[1];
		sid = (data->token >> 8) & 0x0F;