From: Mark Brown <broonie@kernel.org>
Date: Sat, 6 Jul 2019 11:25:26 +0000 (+0100)
Subject: Merge branch 'asoc-5.3' into asoc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=043b35f281f5f141e7a928d27492133ef33b8119;p=linux.git

Merge branch 'asoc-5.3' into asoc-next
---

043b35f281f5f141e7a928d27492133ef33b8119
diff --cc sound/soc/intel/boards/sof_rt5682.c
index 90d262ebeb10b,64db00353e187..daeaa396d9281
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@@ -491,10 -548,10 +548,10 @@@ static int sof_audio_probe(struct platf
  	struct snd_soc_dai_link *dai_links;
  	struct snd_soc_acpi_mach *mach;
  	struct sof_card_private *ctx;
- 	int dmic_num, hdmi_num;
+ 	int dmic_be_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;