| Message ID | 1478013963-28871-2-git-send-email-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2016-01-11 at 15:26:01 UTC, Johan Hovold wrote: > 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...) > Signed-off-by: Johan Hovold <johan@kernel.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/815a7141c4d1b11610dccb7fcbb386 cheers
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c index c7d3ff7e101c..35f5244782d9 100644 --- a/arch/powerpc/kernel/ibmebus.c +++ b/arch/powerpc/kernel/ibmebus.c @@ -180,6 +180,7 @@ static int ibmebus_create_device(struct device_node *dn) 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 struct of_device_id *matches) 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) {
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...) Signed-off-by: Johan Hovold <johan@kernel.org> --- arch/powerpc/kernel/ibmebus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)