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

Commit e11bce4c 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: qdsp6v2: set pointer to NULL after free"

parents 1d0e599e 30baaec8

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

+2 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,7 @@ static int msm_compr_playback_free(struct snd_compr_stream *cstream) 
	kfree(pdata->dec_params[soc_prtd->dai_link->be_id]);

	pdata->dec_params[soc_prtd->dai_link->be_id] = NULL;

	kfree(prtd);

	runtime->private_data = NULL;



	return 0;

}
@@ -1658,6 +1659,7 @@ static int msm_compr_capture_free(struct snd_compr_stream *cstream) 
	q6asm_audio_client_free(ac);



	kfree(prtd);

	runtime->private_data = NULL;



	return 0;

}

sound/soc/msm/qdsp6v2/msm-pcm-afe-v2.c

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

/* Copyright (c) 2012-2017, 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
@@ -684,6 +684,7 @@ done: 
	mutex_unlock(&prtd->lock);

	prtd->prepared--;

	kfree(prtd);

	runtime->private_data = NULL;

	return 0;

}

static int msm_afe_prepare(struct snd_pcm_substream *substream)

sound/soc/msm/qdsp6v2/msm-pcm-lpa-v2.c

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

/* Copyright (c) 2012-2017, 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
@@ -478,6 +478,7 @@ static int msm_pcm_playback_close(struct snd_pcm_substream *substream) 


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

	kfree(prtd);

	runtime->private_data = NULL;



	return 0;

}

sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 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
@@ -544,6 +544,8 @@ static int msm_pcm_close(struct snd_pcm_substream *substream) 
					 SNDRV_PCM_STREAM_PLAYBACK :

					 SNDRV_PCM_STREAM_CAPTURE);

	kfree(prtd);

	runtime->private_data = NULL;



	return 0;

}

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

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, 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
@@ -755,6 +755,8 @@ static int msm_pcm_playback_close(struct snd_pcm_substream *substream) 
	msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->be_id,

						SNDRV_PCM_STREAM_PLAYBACK);

	kfree(prtd);

	runtime->private_data = NULL;



	return 0;

}
@@ -860,6 +862,7 @@ static int msm_pcm_capture_close(struct snd_pcm_substream *substream) 
	msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->be_id,

		SNDRV_PCM_STREAM_CAPTURE);

	kfree(prtd);

	runtime->private_data = NULL;



	return 0;

}