summaryrefslogtreecommitdiff
path: root/drivers/firmware/arm_scmi/power.c
diff options
context:
space:
mode:
authorakpm <akpm@linux-foundation.org>2022-06-27 10:31:44 -0700
committerakpm <akpm@linux-foundation.org>2022-06-27 10:31:44 -0700
commitee56c3e8eec166f4e4a2ca842b7804d14f3a0208 (patch)
tree3bcee4a6090d681b7bbb49d1946c95798f166159 /drivers/firmware/arm_scmi/power.c
parent00c9d5632277b21ba8802e26c27254cd9d0dfa13 (diff)
parent03c765b0e3b4cb5063276b086c76f7a612856a9a (diff)
downloadlwn-ee56c3e8eec166f4e4a2ca842b7804d14f3a0208.tar.gz
lwn-ee56c3e8eec166f4e4a2ca842b7804d14f3a0208.zip
Merge branch 'master' into mm-nonmm-stable
Diffstat (limited to 'drivers/firmware/arm_scmi/power.c')
-rw-r--r--drivers/firmware/arm_scmi/power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c
index 964882cc8747..356e83631664 100644
--- a/drivers/firmware/arm_scmi/power.c
+++ b/drivers/firmware/arm_scmi/power.c
@@ -122,7 +122,7 @@ scmi_power_domain_attributes_get(const struct scmi_protocol_handle *ph,
dom_info->state_set_notify = SUPPORTS_STATE_SET_NOTIFY(flags);
dom_info->state_set_async = SUPPORTS_STATE_SET_ASYNC(flags);
dom_info->state_set_sync = SUPPORTS_STATE_SET_SYNC(flags);
- strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);
+ strscpy(dom_info->name, attr->name, SCMI_SHORT_NAME_MAX_SIZE);
}
ph->xops->xfer_put(ph, t);