diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-12 13:09:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-12 13:09:29 -0800 |
| commit | 261410082d01f2f2d4fcd19abee6b8e84f399c51 (patch) | |
| tree | 11bb78e847fdce41976b0565baf00de6a5548d5a /include | |
| parent | 3077f0279effe1422410dafdf3c14d5756f1239a (diff) | |
| parent | 2a92c90f2ecca4475d6050f2f938a1755a8954cc (diff) | |
Merge tag 'devprop-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull device properties framework fixes from Rafael Wysocki:
"Prevent software nodes from being registered before their parents and
fix a recent mistake causing already registered software nodes to be
registered again in some cases (Heikki Krogerus)"
* tag 'devprop-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
software node: Fix device_add_software_node()
software node: Fix node registration
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/property.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/property.h b/include/linux/property.h index dafccfce0262..dd4687b56239 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -488,7 +488,7 @@ fwnode_create_software_node(const struct property_entry *properties, const struct fwnode_handle *parent); void fwnode_remove_software_node(struct fwnode_handle *fwnode); -int device_add_software_node(struct device *dev, const struct software_node *swnode); +int device_add_software_node(struct device *dev, const struct software_node *node); void device_remove_software_node(struct device *dev); int device_create_managed_software_node(struct device *dev, |