shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rockchip: vad: fix snd_pcm_vad_attached crash

Browse Source 
This patch fix snd_pcm_vad_attached crash when using non-soc audio,
such as usb audio, pci audio. it is because substream private_data
in these types of audio framework means different values.

Change-Id: I5dcd3ea7de363bc3afc8d9879a2a37c6d6110a4a
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang
2018-07-02 19:46:12 +08:00
committed by Tao Huang
parent 7cc5bdef57
commit a797770c35
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/rockchip/rockchip_vad.c
View File

@@ -33,6 +33,7 @@
#define ACODEC_REG_NUM 28
#define VAD_SRAM_BUFFER_END 0xfffbfff8
static struct snd_pcm_substream *vad_substream;
static unsigned int voice_inactive_frames;
module_param(voice_inactive_frames, uint, 0644);
MODULE_PARM_DESC(voice_inactive_frames, "voice inactive frame count");
@@ -306,7 +307,8 @@ bool snd_pcm_vad_attached(struct snd_pcm_substream *substream)
{
struct rockchip_vad *vad = NULL;
vad = substream_get_drvdata(substream);
if (vad_substream == substream)
vad = substream_get_drvdata(substream);
return vad ? true : false;
}
@@ -572,6 +574,14 @@ static int rockchip_vad_enable_cpudai(struct snd_pcm_substream *substream)
return ret;
}
static int rockchip_vad_pcm_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
vad_substream = substream;
return 0;
}
static void rockchip_vad_pcm_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
@@ -583,6 +593,8 @@ static void rockchip_vad_pcm_shutdown(struct snd_pcm_substream *substream,
rockchip_vad_enable_cpudai(substream);
rockchip_vad_setup(vad);
vad_substream = NULL;
}
static int rockchip_vad_trigger(struct snd_pcm_substream *substream, int cmd,
@@ -613,6 +625,7 @@ static int rockchip_vad_trigger(struct snd_pcm_substream *substream, int cmd,
static struct snd_soc_dai_ops rockchip_vad_dai_ops = {
.hw_params = rockchip_vad_hw_params,
.shutdown = rockchip_vad_pcm_shutdown,
.startup = rockchip_vad_pcm_startup,
.trigger = rockchip_vad_trigger,
};