p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: hdac_hdmi: check error return 

As hdac->num_nodes is unsigned we can not check if
snd_hdac_get_sub_nodes() has returned error or success. Lets have a
temporary int to check the error value.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Sudip Mukherjee 2015-12-01 14:29:35 +05:30 committed by Mark Brown
parent 65976878ca
commit 3c83ac2325
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/hdac_hdmi.c
View File

@ -409,17 +409,18 @@ static int hdac_hdmi_init_dai_map(struct hdac_ext_device *edev,
static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev) static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev)
{ {
hda_nid_t nid; hda_nid_t nid;
int i; int i, num_nodes;
struct hdac_device *hdac = &edev->hdac; struct hdac_device *hdac = &edev->hdac;
struct hdac_hdmi_priv *hdmi = edev->private_data; struct hdac_hdmi_priv *hdmi = edev->private_data;
int cvt_nid = 0, pin_nid = 0; int cvt_nid = 0, pin_nid = 0;
hdac->num_nodes = snd_hdac_get_sub_nodes(hdac, hdac->afg, &nid); num_nodes = snd_hdac_get_sub_nodes(hdac, hdac->afg, &nid);
if (!nid || hdac->num_nodes < 0) { if (!nid || num_nodes < 0) {
dev_warn(&hdac->dev, "HDMI: failed to get afg sub nodes\n"); dev_warn(&hdac->dev, "HDMI: failed to get afg sub nodes\n");
return -EINVAL; return -EINVAL;
} }
hdac->num_nodes = num_nodes;
hdac->start_nid = nid; hdac->start_nid = nid;
for (i = 0; i < hdac->num_nodes; i++, nid++) { for (i = 0; i < hdac->num_nodes; i++, nid++) {