diff options
author | Johan Hovold <johan@kernel.org> | 2016-11-16 12:31:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-19 14:18:07 -0500 |
commit | 42eded92c42b7c177ac749e1c44af38acba42d37 (patch) | |
tree | aecbacb3bb8445e783c04ecbbf0d65ef2d4d82f3 | |
parent | d9c19f90f3a50eb4ff8d17616492338c0b2f9434 (diff) |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/bus/vexpress-config.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c index 9efdf1de4035..493e7b9fc813 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) | |||
171 | { | 171 | { |
172 | struct device_node *bridge; | 172 | struct device_node *bridge; |
173 | struct device *parent; | 173 | struct device *parent; |
174 | int ret; | ||
174 | 175 | ||
175 | bridge = of_parse_phandle(node, "arm,vexpress,config-bridge", 0); | 176 | bridge = of_parse_phandle(node, "arm,vexpress,config-bridge", 0); |
176 | if (!bridge) | 177 | if (!bridge) |
@@ -182,7 +183,11 @@ static int vexpress_config_populate(struct device_node *node) | |||
182 | if (WARN_ON(!parent)) | 183 | if (WARN_ON(!parent)) |
183 | return -ENODEV; | 184 | return -ENODEV; |
184 | 185 | ||
185 | return of_platform_populate(node, NULL, NULL, parent); | 186 | ret = of_platform_populate(node, NULL, NULL, parent); |
187 | |||
188 | put_device(parent); | ||
189 | |||
190 | return ret; | ||
186 | } | 191 | } |
187 | 192 | ||
188 | static int __init vexpress_config_init(void) | 193 | static int __init vexpress_config_init(void) |