[PATCH v3 2/3] usb: core: hcd: use ascii2utf16le() in ascii2desc()
From: Richard Leitner <richard.leitner@skidata.com>
Date: 2017-02-06 14:04:11
Also in:
lkml
Subsystem:
the rest, usb subsystem · Maintainers:
Linus Torvalds, Greg Kroah-Hartman
As string.c now provides ascii2utf16le() use it in ascii2desc() for converting the string descriptor. Furthermore fix checkpatch.pl issues in ascii2desc(). Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- drivers/usb/core/hcd.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 479e223..9f84548 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c@@ -407,27 +407,25 @@ MODULE_PARM_DESC(authorized_default, * USB String descriptors can contain at most 126 characters; input * strings longer than that are truncated. */ -static unsigned -ascii2desc(char const *s, u8 *buf, unsigned len) +static unsigned int +ascii2desc(char const *s, u8 *buf, unsigned int len) { - unsigned n, t = 2 + 2*strlen(s); + unsigned int t = 2 + 2 * strlen(s); if (t > 254) t = 254; /* Longest possible UTF string descriptor */ if (len > t) len = t; + if (!len) + return 0; t += USB_DT_STRING << 8; /* Now t is first 16 bits to store */ + *buf++ = t; + if (len < 2) + return len; + *buf++ = t >> 8; - n = len; - while (n--) { - *buf++ = t; - if (!n--) - break; - *buf++ = t >> 8; - t = (unsigned char)*s++; - } - return len; + return ascii2utf16le(s, buf, (len - 2)) + 2; } /**
--
2.1.4