Merge "ASoC: msm: qdsp6v2: Mask un-necessary DTS gain related error log" (99fbaeea) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+6 −7

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2015, 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
		@@ -247,17 +247,16 @@ static int msm_compr_set_volume(struct snd_compr_stream *cstream,
		if (rc < 0)
		pr_err("%s: Send LR gain command failed rc=%d\n",
		__func__, rc);
		else {
		if (msm_dts_eagle_set_stream_gain(prtd->audio_client,
		volume_l, volume_r))
		pr_err("%s: DTS_EAGLE send stream gain failed\n",
		__func__);
		}
		}

		if (rc < 0)
		pr_err("%s: Send vol gain command failed rc=%d\n",
		__func__, rc);
		else
		if (msm_dts_eagle_set_stream_gain(prtd->audio_client,
		volume_l, volume_r))
		pr_debug("%s: DTS_EAGLE send stream gain failed\n",
		__func__);

		return rc;
		}

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015, 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
		@@ -701,7 +701,7 @@ int msm_dts_eagle_set_stream_gain(struct audio_client *ac, int lgain, int rgain)
		__func__, _vol_cmd_cnt, lgain, rgain);

		if (_depc_size == 0) {
		eagle_vol_err("%s: driver cache not initialized", __func__);
		eagle_vol_dbg("%s: driver cache not initialized", __func__);
		return -EINVAL;
		}