From 0342a555146a6cee3ec36b67b9ad777da82ffba7 Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Wed, 9 Jan 2013 10:17:47 +0100 Subject: [PATCH] --- yaml --- r: 354634 b: refs/heads/master c: afd2e186bd7e58dc9d298ff5fb5a2fc30578867e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/f_fs.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 655a9d0982ae..54976263c955 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd76213eb57c505d3df6fa3134a6b3bb5394a90c +refs/heads/master: afd2e186bd7e58dc9d298ff5fb5a2fc30578867e diff --git a/trunk/drivers/usb/gadget/f_fs.c b/trunk/drivers/usb/gadget/f_fs.c index 4a6961c517f2..449186c9fd6c 100644 --- a/trunk/drivers/usb/gadget/f_fs.c +++ b/trunk/drivers/usb/gadget/f_fs.c @@ -1103,8 +1103,8 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data *data, char *opts) return 0; for (;;) { - char *end, *eq, *comma; unsigned long value; + char *eq, *comma; /* Option limit */ comma = strchr(opts, ','); @@ -1120,8 +1120,7 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data *data, char *opts) *eq = 0; /* Parse value */ - value = simple_strtoul(eq + 1, &end, 0); - if (unlikely(*end != ',' && *end != 0)) { + if (kstrtoul(eq + 1, 0, &value)) { pr_err("%s: invalid value: %s\n", opts, eq + 1); return -EINVAL; }