From def7a8e7d74f171c33ea244f189ea89e8e223b46 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Wed, 14 Apr 2021 10:54:38 +0300 Subject: [PATCH] UPSTREAM: software node: Allow node addition to already existing device If the node is added to an already exiting device, the node needs to be also linked to the device separately. This will make sure the reference count is kept in balance also when the node is injected to a device afterwards. Fixes: e68d0119e328 ("software node: Introduce device_add_software_node()") Reported-by: Pierre-Louis Bossart Signed-off-by: Heikki Krogerus Cc: stable Link: https://lore.kernel.org/r/20210414075438.64547-1-heikki.krogerus@linux.intel.com Signed-off-by: Greg Kroah-Hartman (cherry picked from commit b622b24519f5b008f6d4e20e5675eaffa8fbd87b) Bug: 187129171 Signed-off-by: Connor O'Brien Change-Id: I72ab0d95f5b936674e9cf1e567c287799fe6a718 --- drivers/base/swnode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index d53cfe46c30d..254f31443132 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -893,6 +893,7 @@ int device_add_software_node(struct device *dev, const struct software_node *nod } set_secondary_fwnode(dev, &swnode->fwnode); + software_node_notify(dev, KOBJ_ADD); return 0; } @@ -929,8 +930,8 @@ int software_node_notify(struct device *dev, unsigned long action) switch (action) { case KOBJ_ADD: - ret = sysfs_create_link(&dev->kobj, &swnode->kobj, - "software_node"); + ret = sysfs_create_link_nowarn(&dev->kobj, &swnode->kobj, + "software_node"); if (ret) break;