]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ALSA: snd-aoa: add of_node_put() in error path
authorNicholas Mc Guire <hofrat@osadl.org>
Fri, 29 Jun 2018 17:07:42 +0000 (19:07 +0200)
committerJuerg Haefliger <juergh@canonical.com>
Wed, 24 Jul 2019 01:50:55 +0000 (19:50 -0600)
BugLink: https://bugs.launchpad.net/bugs/1836287
[ Upstream commit 222bce5eb88d1af656419db04bcd84b2419fb900 ]

 Both calls to of_find_node_by_name() and of_get_next_child() return a
node pointer with refcount incremented thus it must be explicidly
decremented here after the last usage. As we are assured to have a
refcounted  np  either from the initial
of_find_node_by_name(NULL, name); or from the of_get_next_child(gpio, np)
in the while loop if we reached the error code path below, an
x of_node_put(np) is needed.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: commit f3d9478b2ce4 ("[ALSA] snd-aoa: add snd-aoa")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
sound/aoa/core/gpio-feature.c

index 71960089e207b1032f462bca61512bf93eafbc6a..65557421fe0bad1c02d7975c545828d7e5bb4ec4 100644 (file)
@@ -88,8 +88,10 @@ static struct device_node *get_gpio(char *name,
        }
 
        reg = of_get_property(np, "reg", NULL);
-       if (!reg)
+       if (!reg) {
+               of_node_put(np);
                return NULL;
+       }
 
        *gpioptr = *reg;