diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-15 12:07:20 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-15 12:07:20 +0400 |
| commit | c874b6ba5550b47b667ebf98f549478b4bc988a2 (patch) | |
| tree | ca077e1dac2af78c882437c5ec757b7d8db82166 /drivers/edac/edac_mc_sysfs.c | |
| parent | 397f09977ea350a20f20b415a9313cc790137742 (diff) | |
| parent | 75a9551f2b3792686df25501f248d1de92d5da0f (diff) | |
| download | linux-c874b6ba5550b47b667ebf98f549478b4bc988a2.tar.xz | |
Merge tag 'edac_for_3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull RAS/EDAC updates from Boris Petkov:
"An amd64_edac fix for single channel configurations + trivial cleanups
courtesy of Jingoo Han."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/edac/edac_mc_sysfs.c')
| -rw-r--r-- | drivers/edac/edac_mc_sysfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index e7c32c4f7837..9f7e0e609516 100644 --- 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; - 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; |