Merge tag 'devprop-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit 47d7e65d64cc · 2021-09-24T11:20:29.000-07:00
Pull device properties framework fix from Rafael Wysocki:
 "Fix software node refcount imbalance on device removal (Laurentiu
  Tudor)"

* tag 'devprop-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  software node: balance refcount for managed software nodes
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
@@ -1116,6 +1116,9 @@ int device_create_managed_software_node(struct device *dev,
 	to_swnode(fwnode)->managed = true;
 	set_secondary_fwnode(dev, fwnode);
 
+	if (device_is_registered(dev))
+		software_node_notify(dev);
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(device_create_managed_software_node);

Original file line number	Diff line number	Diff line change
`@@ -1116,6 +1116,9 @@ int device_create_managed_software_node(struct device *dev,`
`1116`	`1116`	`to_swnode(fwnode)->managed = true;`
`1117`	`1117`	`set_secondary_fwnode(dev, fwnode);`
`1118`	`1118`
	`1119`	`+ if (device_is_registered(dev))`
	`1120`	`+ software_node_notify(dev);`
	`1121`	`+`
`1119`	`1122`	`return 0;`
`1120`	`1123`	`}`
`1121`	`1124`	`EXPORT_SYMBOL_GPL(device_create_managed_software_node);`