Merge "ASoC: Compress: Remove unused hw_params pointer" (4b5e5f7c) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

sound/soc/soc-compress.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -474,7 +474,6 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
		struct snd_soc_pcm_runtime *fe = cstream->private_data;
		struct snd_pcm_substream *fe_substream = fe->pcm->streams[0].substream;
		struct snd_soc_platform *platform = fe->platform;
		struct snd_pcm_hw_params *hw_params;
		int ret = 0, stream;

		if (cstream->direction == SND_COMPRESS_PLAYBACK)
		@@ -482,10 +481,6 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
		else
		stream = SNDRV_PCM_STREAM_CAPTURE;

		hw_params = kzalloc(sizeof(*hw_params), GFP_KERNEL);
		if (hw_params == NULL)
		return -ENOMEM;

		mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

		/* first we call set_params for the platform driver