[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <applied-20191119113640.166940-1-colin.king@canonical.com>
Date: Tue, 25 Feb 2020 13:24:01 +0000
From: Mark Brown <broonie@...nel.org>
To: Colin Ian King <colin.king@...onical.com>
Cc: alsa-devel@...a-project.org,
Cezary Rojewski <cezary.rojewski@...el.com>,
Jaroslav Kysela <perex@...ex.cz>,
Jie Yang <yang.jie@...ux.intel.com>,
kernel-janitors@...r.kernel.org,
Liam Girdwood <liam.r.girdwood@...ux.intel.com>,
linux-kernel@...r.kernel.org, Mark Brown <broonie@...nel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@...ux.intel.com>,
"Subhransu S . Prusty" <subhransu.s.prusty@...el.com>,
Takashi Iwai <tiwai@...e.com>, Vinod Koul <vkoul@...nel.org>
Subject: Applied "ASoC: Intel: mrfld: fix incorrect check on p->sink" to the asoc tree
The patch
ASoC: Intel: mrfld: fix incorrect check on p->sink
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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 f5e056e1e46fcbb5f74ce560792aeb7d57ce79e6 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@...onical.com>
Date: Tue, 19 Nov 2019 11:36:40 +0000
Subject: [PATCH] ASoC: Intel: mrfld: fix incorrect check on p->sink
The check on p->sink looks bogus, I believe it should be p->source
since the following code blocks are related to p->source. Fix
this by replacing p->sink with p->source.
Fixes: 24c8d14192cc ("ASoC: Intel: mrfld: add DSP core controls")
Signed-off-by: Colin Ian King <colin.king@...onical.com>
Addresses-Coverity: ("Copy-paste error")
Link: https://lore.kernel.org/r/20191119113640.166940-1-colin.king@canonical.com
Signed-off-by: Mark Brown <broonie@...nel.org>
---
sound/soc/intel/atom/sst-atom-controls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index baef461a99f1..f883c9340eee 100644
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -1333,7 +1333,7 @@ int sst_send_pipe_gains(struct snd_soc_dai *dai, int stream, int mute)
dai->capture_widget->name);
w = dai->capture_widget;
snd_soc_dapm_widget_for_each_source_path(w, p) {
- if (p->connected && !p->connected(w, p->sink))
+ if (p->connected && !p->connected(w, p->source))
continue;
if (p->connect && p->source->power &&
--
2.20.1
Powered by blists - more mailing lists