aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/boards
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-07-06 12:25:24 +0100
committerMark Brown <broonie@kernel.org>2019-07-06 12:25:24 +0100
commit0dceaf7c798de953c74073cc77be40b7be49abbc (patch)
tree8014fcd5783090ced8024d71d3d943676033af8e /sound/soc/intel/boards
parentLinux 5.2-rc7 (diff)
parentASoC: audio-graph-card: fix use-after-free in graph_for_each_link (diff)
downloadlinux-dev-0dceaf7c798de953c74073cc77be40b7be49abbc.tar.xz
linux-dev-0dceaf7c798de953c74073cc77be40b7be49abbc.zip
Merge branch 'asoc-5.2' into asoc-linus
Diffstat (limited to 'sound/soc/intel/boards')
-rw-r--r--sound/soc/intel/boards/sof_rt5682.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 3343dbcd506f..90d262ebeb10 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -494,7 +494,7 @@ static int sof_audio_probe(struct platform_device *pdev)
int dmic_num, hdmi_num;
int ret, ssp_amp, ssp_codec;
- ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC);
+ ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return -ENOMEM;