From 6d03a247468059b0e59c821ef39e6762d4d6fc30 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 23:00:51 +0200 Subject: Merging upstream version 6.9.2. Signed-off-by: Daniel Baumann --- drivers/of/module.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/of/module.c') diff --git a/drivers/of/module.c b/drivers/of/module.c index 780fd82a7e..f58e624953 100644 --- a/drivers/of/module.c +++ b/drivers/of/module.c @@ -29,15 +29,14 @@ ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len) csize = snprintf(str, len, "of:N%pOFn%c%s", np, 'T', of_node_get_device_type(np)); tsize = csize; - if (csize >= len) - csize = len > 0 ? len - 1 : 0; len -= csize; - str += csize; + if (str) + str += csize; of_property_for_each_string(np, "compatible", p, compat) { csize = strlen(compat) + 1; tsize += csize; - if (csize >= len) + if (csize > len) continue; csize = snprintf(str, len, "C%s", compat); -- cgit v1.2.3