Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / fs / ncpfs / getopt.c

diff --git a/fs/ncpfs/getopt.c b/fs/ncpfs/getopt.c
index 03ffde1f44d699764ad7e956c8cbe60fc8428dd2..344889cd120ed156671d2c9d745c07802bae0c5f 100644 (file)
--- a/fs/ncpfs/getopt.c
+++ b/fs/ncpfs/getopt.c
@@ -53,15 +53,14 @@ int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts
                                return -EINVAL;
                        }
                        if (opts->has_arg & OPT_INT) {
-                               char* v;
+                               int rc = kstrtoul(val, 0, value);
 
-                               *value = simple_strtoul(val, &v, 0);
-                               if (!*v) {
-                                       return opts->val;
+                               if (rc) {
+                                       pr_info("%s: invalid numeric value in %s=%s\n",
+                                               caller, token, val);
+                                       return rc;
                                }
-                               pr_info("%s: invalid numeric value in %s=%s\n",
-                                       caller, token, val);
-                               return -EDOM;
+                               return opts->val;
                        }
                        if (opts->has_arg & OPT_STRING) {
                                return opts->val;