summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/configfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget/configfs.c')
-rw-r--r--drivers/usb/gadget/configfs.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 7c5368e42993..9ba61939eed6 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -145,8 +145,7 @@ struct gadget_config_name {
struct list_head list;
};
-#define MAX_USB_STRING_LEN 126
-#define MAX_USB_STRING_WITH_NULL_LEN (MAX_USB_STRING_LEN+1)
+#define USB_MAX_STRING_WITH_NULL_LEN (USB_MAX_STRING_LEN+1)
static int usb_string_copy(const char *s, char **s_copy)
{
@@ -154,17 +153,17 @@ static int usb_string_copy(const char *s, char **s_copy)
char *str;
char *copy = *s_copy;
ret = strlen(s);
- if (ret > MAX_USB_STRING_LEN)
+ if (ret > USB_MAX_STRING_LEN)
return -EOVERFLOW;
if (copy) {
str = copy;
} else {
- str = kmalloc(MAX_USB_STRING_WITH_NULL_LEN, GFP_KERNEL);
+ str = kmalloc(USB_MAX_STRING_WITH_NULL_LEN, GFP_KERNEL);
if (!str)
return -ENOMEM;
}
- strlcpy(str, s, MAX_USB_STRING_WITH_NULL_LEN);
+ strcpy(str, s);
if (str[ret - 1] == '\n')
str[ret - 1] = '\0';
*s_copy = str;