Commit 541140d4 authored Dec 09, 2015 by Subhransu S. Prusty Committed by Mark Brown Jan 05, 2016

ASoC: hdac_hdmi: Fix to check num nodes correctly



commit 3c83ac23 ("ASoC: hdac_hdmi: check error return") fixes
the static checker warning reported by Dan Carpenter:

	sound/soc/codecs/hdac_hdmi.c:416 hdac_hdmi_parse_and_map_nid()
	warn: unsigned 'hdac->num_nodes' is never less than zero.

But it doesn't fix the issue completely.

It's also a failure if no sub nodes found for an afg node. So modify
the return condition appropriately.

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent ee1e4e3f

sound/soc/codecs/hdac_hdmi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -415,7 +415,7 @@ static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev)
		int cvt_nid = 0, pin_nid = 0;

		num_nodes = snd_hdac_get_sub_nodes(hdac, hdac->afg, &nid);
		if (!nid \|\| num_nodes < 0) {
		if (!nid \|\| num_nodes <= 0) {
		dev_warn(&hdac->dev, "HDMI: failed to get afg sub nodes\n");
		return -EINVAL;
		}

Admin message