| From 815a7141c4d1b11610dccb7fcbb38633759824f2 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 1 Nov 2016 16:26:01 +0100 |
| Subject: powerpc/ibmebus: Fix further device reference leaks |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| commit 815a7141c4d1b11610dccb7fcbb38633759824f2 upstream. |
| |
| Make sure to drop any reference taken by bus_find_device() when creating |
| devices during init and driver registration. |
| |
| Fixes: 55347cc9962f ("[POWERPC] ibmebus: Add device creation and bus probing based on of_device") |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/powerpc/kernel/ibmebus.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/arch/powerpc/kernel/ibmebus.c |
| +++ b/arch/powerpc/kernel/ibmebus.c |
| @@ -180,6 +180,7 @@ static int ibmebus_create_device(struct |
| static int ibmebus_create_devices(const struct of_device_id *matches) |
| { |
| struct device_node *root, *child; |
| + struct device *dev; |
| int ret = 0; |
| |
| root = of_find_node_by_path("/"); |
| @@ -188,9 +189,12 @@ static int ibmebus_create_devices(const |
| if (!of_match_node(matches, child)) |
| continue; |
| |
| - if (bus_find_device(&ibmebus_bus_type, NULL, child, |
| - ibmebus_match_node)) |
| + dev = bus_find_device(&ibmebus_bus_type, NULL, child, |
| + ibmebus_match_node); |
| + if (dev) { |
| + put_device(dev); |
| continue; |
| + } |
| |
| ret = ibmebus_create_device(child); |
| if (ret) { |
