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

[firefly-linux-kernel-4.4.55.git] / arch / mips / fw / lib / cmdline.c

diff --git a/arch/mips/fw/lib/cmdline.c b/arch/mips/fw/lib/cmdline.c
index a0c361e6a5d2d642a20e9d1728dce51b8c0469a4..6ecda64ad18423f5e27e22cf9ccf8786a5062cac 100644 (file)
--- a/arch/mips/fw/lib/cmdline.c
+++ b/arch/mips/fw/lib/cmdline.c
@@ -88,13 +88,13 @@ unsigned long fw_getenvl(char *envname)
 {
        unsigned long envl = 0UL;
        char *str;
-       long val;
        int tmp;
 
        str = fw_getenv(envname);
        if (str) {
-               tmp = kstrtol(str, 0, &val);
-               envl = (unsigned long)val;
+               tmp = kstrtoul(str, 0, &envl);
+               if (tmp)
+                       envl = 0;
        }
 
        return envl;