Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 124fb65c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 895a1ddf on remote branch 

Change-Id: Ib58cd3e34fd7d1eab6e75c783789359c75db360c
parents 20e69ff3 895a1ddf

asoc/msm-audio-effects-q6-v2.c

+4 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/slab.h>
@@ -16,7 +16,7 @@ 
#define GET_NEXT(ptr, upper_limit, rc)                                  \

({                                                                      \

	if (((ptr) + 1) > (upper_limit)) {                              \

		pr_err_ratelimited("%s: param list out of boundary\n",  \

		pr_debug_ratelimited("%s: param list out of boundary\n",  \

				   __func__);				\

		(rc) = -EINVAL;                                         \

	}                                                               \
@@ -26,7 +26,7 @@ 
#define CHECK_PARAM_LEN(len, max_len, tag, rc)                          \

do {                                                                    \

	if ((len) > (max_len)) {                                        \

		pr_err_ratelimited("%s: params length overflows\n",	\

		pr_debug_ratelimited("%s: params length overflows\n",	\

				   (tag));				\

		(rc) = -EINVAL;                                         \

	}                                                               \
@@ -1409,7 +1409,7 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac, 
					"VOLUME/VOLUME2_GAIN_MASTER", rc);

			break;

		default:

			pr_err_ratelimited("%s: Invalid command id: %d to set config\n",

			pr_debug_ratelimited("%s: Invalid command id: %d to set config\n",

				__func__, command_id);

			continue;

		}

asoc/msm-dai-q6-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -4697,7 +4697,7 @@ static struct snd_soc_dai_driver msm_dai_q6_afe_rx_dai[] = { 
			 .formats = SNDRV_PCM_FMTBIT_S16_LE |

			 SNDRV_PCM_FMTBIT_S24_LE,

			 .channels_min = 1,

			 .channels_max = 2,

			 .channels_max = 10,

			 .rate_min =     8000,

			 .rate_max =	48000,

		},

asoc/msm-pcm-afe-v2.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.

 */
@@ -50,7 +50,7 @@ static struct snd_pcm_hardware msm_afe_hardware_playback = { 
	.rate_min =             8000,

	.rate_max =             48000,

	.channels_min =         1,

	.channels_max =         6,

	.channels_max =         10,

	.buffer_bytes_max =     MAX_PLAYBACK_PERIOD_SIZE *

				MAX_PLAYBACK_NUM_PERIODS,

	.period_bytes_min =     MIN_PLAYBACK_PERIOD_SIZE,

asoc/msm-pcm-q6-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <dsp/q6audio-v2.h>

#include <dsp/q6core.h>

#include <dsp/q6asm-v2.h>

#ifdef CONFIG_MSM_BOOT_TIME_MARKER

#ifdef CONFIG_MSM_BOOT_STATS

#include <soc/qcom/boot_stats.h>

#endif
@@ -699,7 +699,7 @@ static int msm_pcm_trigger(struct snd_pcm_substream *substream, int cmd) 
	case SNDRV_PCM_TRIGGER_RESUME:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		if (first_time) {

#ifdef CONFIG_MSM_BOOT_TIME_MARKER

#ifdef CONFIG_MSM_BOOT_STATS

			place_marker("K - Early chime");

#endif

			first_time = 0;

asoc/msm-pcm-routing-v2.c

+8828 −1428

File changed.

Preview size limit exceeded, changes collapsed.