diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 13:49:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 13:49:54 -0800 |
| commit | 542d0e583b7b366527175b2b5fc0aad262fa33b0 (patch) | |
| tree | 501a333ce1879c3d4dbc62366c8616b1eca03c5c /include/linux | |
| parent | d276709ce6c90b9eceecdbd01a0c083ab04d3a52 (diff) | |
| parent | 344798206f171c5abea7ab1f9762fa526d7f539d (diff) | |
Merge tag 'devprop-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull device properties framework updates from Rafael Wysocki:
"Fix the length value used in the PROPERTY_ENTRY_STRING() macro and
make software nodes use the get_named_child_node() fwnode callback
(Heikki Krogerus)"
* tag 'devprop-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
software node: Implement get_named_child_node fwnode callback
device property: Fix the length used in PROPERTY_ENTRY_STRING()
Diffstat (limited to 'include/linux')
| -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 3789ec755fb6..65d3420dd5d1 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -258,7 +258,7 @@ struct property_entry { #define PROPERTY_ENTRY_STRING(_name_, _val_) \ (struct property_entry) { \ .name = _name_, \ - .length = sizeof(_val_), \ + .length = sizeof(const char *), \ .type = DEV_PROP_STRING, \ { .value = { .str = _val_ } }, \ } |