diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-08 16:22:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-08 16:22:15 +1000 |
| commit | c39eb7727ca46d1819b66ccb4518376c9f38f568 (patch) | |
| tree | 7dc3b374d1433c72514634a3969515e2c87f7e96 /arch/arm/mach-w90x900/cpu.c | |
| parent | 9028bb948d3c3a5bfd5c4c66854a34f9a0d3c59d (diff) | |
| parent | fe6140d1e45157761c950abdbab3e9c1777b1e44 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arm/mach-w90x900/cpu.c')
| -rw-r--r-- | arch/arm/mach-w90x900/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c index b1eabaad50a5..213230ee57d1 100644 --- a/arch/arm/mach-w90x900/cpu.c +++ b/arch/arm/mach-w90x900/cpu.c @@ -178,7 +178,8 @@ static int __init nuc900_set_cpufreq(char *str) if (!*str) return 0; - strict_strtoul(str, 0, &cpufreq); + if (kstrtoul(str, 0, &cpufreq)) + return 0; nuc900_clock_source(NULL, "ext"); |