From: Heikki Krogerus Date: Wed, 14 Apr 2021 07:54:38 +0000 (+0300) Subject: software node: Allow node addition to already existing device X-Git-Tag: v5.12.4~670 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=226c0978a22661f6382b7063f6db128179c4ac8f;p=thirdparty%2Fkernel%2Fstable.git software node: Allow node addition to already existing device commit b622b24519f5b008f6d4e20e5675eaffa8fbd87b upstream. 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 --- diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index fa3719ef80e4d..88310ac9ce906 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -1032,6 +1032,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; } @@ -1105,8 +1106,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;