]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: hdac_hdmi: check error return
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Tue, 1 Dec 2015 08:59:35 +0000 (14:29 +0530)
committerMark Brown <broonie@kernel.org>
Tue, 1 Dec 2015 18:44:26 +0000 (18:44 +0000)
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>
sound/soc/codecs/hdac_hdmi.c

index 205f2c27263d41b119f78ab614189cf4aea9084c..1a2f33b4abfc5e60c76e9d94cf96c04695382d96 100644 (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)
 {
        hda_nid_t nid;
-       int i;
+       int i, num_nodes;
        struct hdac_device *hdac = &edev->hdac;
        struct hdac_hdmi_priv *hdmi = edev->private_data;
        int cvt_nid = 0, pin_nid = 0;
 
-       hdac->num_nodes = snd_hdac_get_sub_nodes(hdac, hdac->afg, &nid);
-       if (!nid || hdac->num_nodes < 0) {
+       num_nodes = snd_hdac_get_sub_nodes(hdac, hdac->afg, &nid);
+       if (!nid || num_nodes < 0) {
                dev_warn(&hdac->dev, "HDMI: failed to get afg sub nodes\n");
                return -EINVAL;
        }
 
+       hdac->num_nodes = num_nodes;
        hdac->start_nid = nid;
 
        for (i = 0; i < hdac->num_nodes; i++, nid++) {