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

Commit 5ff58d1a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: update log level to avoid execessive logging"

parents 168576ae 2ce67848

asoc/msm-compress-q6-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -3284,7 +3284,7 @@ static int msm_compr_audio_effects_config_get(struct snd_kcontrol *kcontrol, 
	cstream = pdata->cstream[fe_id];

	audio_effects = pdata->audio_effects[fe_id];

	if (!cstream || !audio_effects) {

		pr_err("%s: stream or effects inactive\n", __func__);

		pr_debug("%s: stream or effects inactive\n", __func__);

		return -EINVAL;

	}

	prtd = cstream->runtime->private_data;

asoc/msm-dai-q6-hdmi-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int msm_dai_q6_ext_disp_drift_get(struct snd_kcontrol *kcontrol, 
	struct msm_dai_q6_hdmi_dai_data *dai_data = dev_get_drvdata(dai->dev);



	if (!test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {

		pr_err("%s:  afe port not started. status_mask = %ld\n",

		pr_debug("%s:  afe port not started. status_mask = %ld\n",

			__func__, *dai_data->status_mask);

		goto done;

	}

asoc/msm-dai-q6-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -3077,7 +3077,7 @@ static int msm_dai_q6_slim_rx_drift_get(struct snd_kcontrol *kcontrol, 
	struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev);



	if (!test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) {

		pr_err("%s: afe port not started. dai_data->status_mask = %ld\n",

		pr_debug("%s: afe port not started. dai_data->status_mask = %ld\n",

			__func__, *dai_data->status_mask);

		goto done;

	}

asoc/msm-pcm-loopback-v2.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, 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
@@ -517,7 +517,7 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol, 


	pr_debug("%s\n", __func__);

	if ((!substream) || (!substream->runtime)) {

		pr_err("%s substream or runtime not found\n", __func__);

		pr_debug("%s substream or runtime not found\n", __func__);

		rc = -ENODEV;

		goto exit;

	}

asoc/msm-pcm-q6-noirq.c

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol, 
		return -ENODEV;

	}

	if (!substream->runtime) {

		pr_err("%s substream runtime not found\n", __func__);

		pr_debug("%s substream runtime not found\n", __func__);

		return 0;

	}

	prtd = substream->runtime->private_data;