projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
edac
/
edac_mc_sysfs.c
diff --git
a/drivers/edac/edac_mc_sysfs.c
b/drivers/edac/edac_mc_sysfs.c
index e7c32c4f783737962b575a232f03b5ed19d3629b..9f7e0e609516c536ae9a7366f8e1c23e1c6cf32c 100644
(file)
--- a/
drivers/edac/edac_mc_sysfs.c
+++ b/
drivers/edac/edac_mc_sysfs.c
@@
-58,8
+58,10
@@
static int edac_set_poll_msec(const char *val, struct kernel_param *kp)
if (!val)
return -EINVAL;
if (!val)
return -EINVAL;
- ret = strict_strtol(val, 0, &l);
- if (ret == -EINVAL || ((int)l != l))
+ ret = kstrtol(val, 0, &l);
+ if (ret)
+ return ret;
+ if ((int)l != l)
return -EINVAL;
*((int *)kp->arg) = l;
return -EINVAL;
*((int *)kp->arg) = l;