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

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

Merge "ASoC: msm: decrement slim channel ref to set the property"

parents b652fd14 cef94edd

sound/soc/msm/qdsp6v2/msm-dai-slim.c

+12 −13
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static int msm_dai_slim_prepare(struct snd_pcm_substream *substream, 
	struct msm_slim_dai_data *dai_data = NULL;

	struct slim_ch prop;

	int rc;

	u8 i, j;

	u8 i;



	dai_data = msm_slim_get_dai_data(drv_data, dai);

	if (!dai_data) {
@@ -346,6 +346,13 @@ static int msm_dai_slim_prepare(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	if (dai_data->status & DAI_STATE_PREPARED) {

		dev_dbg(dai->dev,

			"%s: dai id (%d) has already prepared.\n",

			__func__, dai->id);

		return 0;

	}



	dma_data = &dai_data->dma_data;

	snd_soc_dai_set_dma_data(dai, substream, dma_data);
@@ -359,6 +366,10 @@ static int msm_dai_slim_prepare(struct snd_pcm_substream *substream, 
		}

	}



	/* To decrement the channel ref count*/

	for (i = 0; i < dai_data->ch_cnt; i++)

		slim_dealloc_ch(drv_data->sdev, dai_data->chan_h[i]);



	prop.prot = SLIM_AUTO_ISO;

	prop.baser = SLIM_RATE_4000HZ;

	prop.dataf = SLIM_CH_DATAF_NOT_DEFINED;
@@ -382,8 +393,6 @@ static int msm_dai_slim_prepare(struct snd_pcm_substream *substream, 


error_define_chan:

error_chan_query:

	for (j = 0; j < i; j++)

		slim_dealloc_ch(drv_data->sdev, dai_data->chan_h[j]);

	return rc;

}
@@ -393,7 +402,6 @@ static void msm_dai_slim_shutdown(struct snd_pcm_substream *stream, 
	struct msm_dai_slim_drv_data *drv_data = dev_get_drvdata(dai->dev);

	struct msm_slim_dma_data *dma_data = NULL;

	struct msm_slim_dai_data *dai_data;

	int i, rc = 0;



	dai_data = msm_slim_get_dai_data(drv_data, dai);

	dma_data = snd_soc_dai_get_dma_data(dai, stream);
@@ -412,15 +420,6 @@ static void msm_dai_slim_shutdown(struct snd_pcm_substream *stream, 
		return;

	}



	for (i = 0; i < dai_data->ch_cnt; i++) {

		rc = slim_dealloc_ch(drv_data->sdev, dai_data->chan_h[i]);

		if (rc) {

			dev_err(dai->dev,

				"%s: dealloc_ch failed, err = %d\n",

				__func__, rc);

		}

	}



	snd_soc_dai_set_dma_data(dai, stream, NULL);

	/* clear prepared state for the dai */

	CLR_DAI_STATE(dai_data->status, DAI_STATE_PREPARED);