summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2016-11-16 17:31:30 +0000
committerBen Hutchings <ben@decadent.org.uk>2017-03-16 02:26:27 +0000
commite50167ae9fd50c3188374aa257e60f3cc6f9ba40 (patch)
tree34c02daf3a3a7808961d0a75bbd7605a961d4f3d /drivers/bus
parent413bd41e9d8b99d6bd1d1370f7a44db318771fbc (diff)
downloadlinux-stable-e50167ae9fd50c3188374aa257e60f3cc6f9ba40.tar.gz
linux-stable-e50167ae9fd50c3188374aa257e60f3cc6f9ba40.tar.bz2
linux-stable-e50167ae9fd50c3188374aa257e60f3cc6f9ba40.zip
bus: vexpress-config: fix device reference leak
commit c090959b9dd8c87703e275079aa4b4a824ba3f8e upstream. Make sure to drop the reference to the parent device taken by class_find_device() after populating the bus. Fixes: 3b9334ac835b ("mfd: vexpress: Convert custom func API to regmap") Acked-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/vexpress-config.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c
index a64763b6b5fd..a803e5d84baf 100644
--- a/drivers/bus/vexpress-config.c
+++ b/drivers/bus/vexpress-config.c
@@ -171,6 +171,7 @@ static int vexpress_config_populate(struct device_node *node)
{
struct device_node *bridge;
struct device *parent;
+ int ret;
bridge = of_parse_phandle(node, "arm,vexpress,config-bridge", 0);
if (!bridge)
@@ -181,7 +182,11 @@ static int vexpress_config_populate(struct device_node *node)
if (WARN_ON(!parent))
return -ENODEV;
- return of_platform_populate(node, NULL, NULL, parent);
+ ret = of_platform_populate(node, NULL, NULL, parent);
+
+ put_device(parent);
+
+ return ret;
}
static int __init vexpress_config_init(void)