Merge 6678bc64391fa981bbccfe0c295adb128bae3e59 on remote branch (6ca1ffb2) · Commits · e / devices / android_kernel_xiaomi_nabu

asoc/msm-pcm-routing-v2.c

+8 −7

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -17246,9 +17246,9 @@ static int msm_routing_put_app_type_cfg_control(struct snd_kcontrol *kcontrol,

		memset(app_type_cfg, 0, MAX_APP_TYPES*
		sizeof(struct msm_pcm_routing_app_type_data));
		if (num_app_types > MAX_APP_TYPES) {
		pr_err("%s: number of app types exceed the max supported\n",
		__func__);
		if (num_app_types > MAX_APP_TYPES \|\| num_app_types < 0) {
		pr_err("%s: number of app types %d is invalid\n",
		__func__, num_app_types) ;
		return -EINVAL;
		}
		for (j = 0; j < num_app_types; j++) {
		@@ -17453,9 +17453,10 @@ static int msm_routing_put_lsm_app_type_cfg_control(
		int num_app_types;

		mutex_lock(&routing_lock);
		if (ucontrol->value.integer.value[0] > MAX_APP_TYPES) {
		pr_err("%s: number of app types exceed the max supported\n",
		__func__);
		if (ucontrol->value.integer.value[0] < 0 \|\|
		ucontrol->value.integer.value[0] > MAX_APP_TYPES) {
		pr_err("%s: number of app types %ld is invalid\n",
		__func__, ucontrol->value.integer.value[0]);
		mutex_unlock(&routing_lock);
		return -EINVAL;
		}