summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>2020-04-15 12:28:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-10 10:30:07 +0200
commit14dfe0e4e3a308583fc422a7c48e72b30ada9ce7 (patch)
treed4e2aa3ffb908f5ef28a414c7fc1ac10b1f72e60 /sound
parent278a15769bd85a2dbea303af00d660248cc2fcef (diff)
downloadlinux-stable-14dfe0e4e3a308583fc422a7c48e72b30ada9ce7.tar.gz
linux-stable-14dfe0e4e3a308583fc422a7c48e72b30ada9ce7.tar.bz2
linux-stable-14dfe0e4e3a308583fc422a7c48e72b30ada9ce7.zip
ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry
[ Upstream commit 326b509238171d37402dbe308e154cc234ed1960 ] If we don't find any pcm, pcm will point at address at an offset from the the list head and not a meaningful structure. Fix this by returning correct pcm if found and NULL if not. Found with coccinelle. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20200415162849.308-1-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/hdac_hdmi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index be2473166bfa..4594b1447900 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -148,14 +148,14 @@ static struct hdac_hdmi_pcm *
hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi,
struct hdac_hdmi_cvt *cvt)
{
- struct hdac_hdmi_pcm *pcm = NULL;
+ struct hdac_hdmi_pcm *pcm;
list_for_each_entry(pcm, &hdmi->pcm_list, head) {
if (pcm->cvt == cvt)
- break;
+ return pcm;
}
- return pcm;
+ return NULL;
}
static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm,