[alsa-devel] Applied "ASoC: Intel: sof-rt5682: add newline for clarity" to the asoc tree
Mark Brown
broonie at kernel.org
Tue May 21 22:32:40 CEST 2019
The patch
ASoC: Intel: sof-rt5682: add newline for clarity
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From b385256eb54f0193f0f595a675409ba6e7282ffe Mon Sep 17 00:00:00 2001
From: Sathya Prakash M R <sathya.prakash.m.r at intel.com>
Date: Mon, 20 May 2019 14:46:43 -0500
Subject: [PATCH] ASoC: Intel: sof-rt5682: add newline for clarity
Make sure quirk handling is cleary split from number of links.
Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r at intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>
Signed-off-by: Mark Brown <broonie at kernel.org>
---
sound/soc/intel/boards/sof_rt5682.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index f28fb98cc306..fea42e275326 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -519,6 +519,7 @@ static int sof_audio_probe(struct platform_device *pdev)
/* compute number of dai links */
sof_audio_card_rt5682.num_links = 1 + dmic_num + hdmi_num;
+
if (sof_rt5682_quirk & SOF_SPEAKER_AMP_PRESENT)
sof_audio_card_rt5682.num_links++;
--
2.20.1
More information about the Alsa-devel
mailing list