diff options
| author | Stefan Agner <stefan@agner.ch> | 2017-04-14 18:35:08 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2017-12-14 23:29:50 +0100 |
| commit | 916f5680dd0d609d78b9e215258b63463f7571c6 (patch) | |
| tree | 255709506f1d749e0f2e655cc7b19cfb029fc67a | |
| parent | 18717e2b1ca9b0fbf8bafa2717719e1f2c8f1114 (diff) | |
usb: gadget: configfs: make qw_sign attribute symmetric
Currently qw_sign requires UTF-8 character to set, but returns UTF-16
when read. This isn't obvious when simply using cat since the null
characters are not visible, but hexdump unveils the true string:
# echo MSFT100 > os_desc/qw_sign
# hexdump -C os_desc/qw_sign
00000000 4d 00 53 00 46 00 54 00 31 00 30 00 30 00 |M.S.F.T.1.0.0.|
Make qw_sign symmetric by returning an UTF-8 string too. Also follow
common convention and add a new line at the end.
Reviewed-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
(cherry picked from commit 76180d716f91f035d9c8639497cf5459b44e1a51)
| -rw-r--r-- | drivers/usb/gadget/configfs.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index 8912bfc1887c..9908d3612068 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -828,12 +828,15 @@ static struct os_desc_attribute os_desc_b_vendor_code = static ssize_t os_desc_qw_sign_show(struct os_desc *os_desc, char *page) { struct gadget_info *gi; + int res; gi = to_gadget_info(os_desc->group.cg_item.ci_parent); - memcpy(page, gi->qw_sign, OS_STRING_QW_SIGN_LEN); + res = utf16s_to_utf8s((wchar_t *) gi->qw_sign, OS_STRING_QW_SIGN_LEN, + UTF16_LITTLE_ENDIAN, page, PAGE_SIZE - 1); + page[res++] = '\n'; - return OS_STRING_QW_SIGN_LEN; + return res; } static ssize_t os_desc_qw_sign_store(struct os_desc *os_desc, const char *page, |