summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2016-11-16 17:31:30 +0000
committerArnd Bergmann <arnd@arndb.de>2016-11-30 23:29:37 +0100
commitc090959b9dd8c87703e275079aa4b4a824ba3f8e (patch)
tree59c5c602924936f45eaf180ccf82750afc7e1451 /drivers/bus
parent920f8bf7f366ed20935669f782ffcb5a36d5df8f (diff)
downloadop-kernel-dev-c090959b9dd8c87703e275079aa4b4a824ba3f8e.zip
op-kernel-dev-c090959b9dd8c87703e275079aa4b4a824ba3f8e.tar.gz
bus: vexpress-config: fix device reference leak
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>
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 9efdf1d..493e7b9 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)
@@ -182,7 +183,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)
OpenPOWER on IntegriCloud