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

Commit 9001b0c3 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: q6dspv2: initialize private data before using it"

parents c89a34e2 2852b361

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

+15 −14
Original line number Diff line number Diff line
@@ -1074,20 +1074,6 @@ static int msm_compr_open(struct snd_compr_stream *cstream) 
		kfree(prtd);

		return -ENOMEM;

	}

	prtd->audio_client = q6asm_audio_client_alloc(

				(app_cb)compr_event_handler, prtd);

	if (!prtd->audio_client) {

		pr_err("%s: Could not allocate memory for client\n", __func__);

		kfree(pdata->audio_effects[rtd->dai_link->be_id]);

		kfree(pdata->dec_params[rtd->dai_link->be_id]);

		pdata->cstream[rtd->dai_link->be_id] = NULL;

		kfree(prtd);

		return -ENOMEM;

	}



	pr_debug("%s: session ID %d\n", __func__, prtd->audio_client->session);

	prtd->audio_client->perf_mode = false;

	prtd->session_id = prtd->audio_client->session;

	prtd->codec = FORMAT_MP3;

	prtd->bytes_received = 0;

	prtd->bytes_sent = 0;
@@ -1126,6 +1112,21 @@ static int msm_compr_open(struct snd_compr_stream *cstream) 


	runtime->private_data = prtd;

	populate_codec_list(prtd);

	prtd->audio_client = q6asm_audio_client_alloc(

				(app_cb)compr_event_handler, prtd);

	if (!prtd->audio_client) {

		pr_err("%s: Could not allocate memory for client\n", __func__);

		kfree(pdata->audio_effects[rtd->dai_link->be_id]);

		kfree(pdata->dec_params[rtd->dai_link->be_id]);

		pdata->cstream[rtd->dai_link->be_id] = NULL;

		runtime->private_data = NULL;

		kfree(prtd);

		return -ENOMEM;

	}



	pr_debug("%s: session ID %d\n", __func__, prtd->audio_client->session);

	prtd->audio_client->perf_mode = false;

	prtd->session_id = prtd->audio_client->session;



	return 0;

}