projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a54cd5
)
PM / hibernate: convert simple_strtoul to kstrtoul
author
Fabian Frederick
<fabf@skynet.be>
Fri, 9 May 2014 21:32:08 +0000
(23:32 +0200)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 9 May 2014 21:32:08 +0000
(23:32 +0200)
Replace obsolete function.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
kernel/power/hibernate.c
patch
|
blob
|
history
diff --git
a/kernel/power/hibernate.c
b/kernel/power/hibernate.c
index
1f08ac7
..
2377ff7
100644
(file)
--- a/
kernel/power/hibernate.c
+++ b/
kernel/power/hibernate.c
@@
-1115,7
+1115,10
@@
static int __init resumewait_setup(char *str)
static int __init resumedelay_setup(char *str)
{
- resume_delay = simple_strtoul(str, NULL, 0);
+ int rc = kstrtoul(str, 0, (unsigned long *)&resume_delay);
+
+ if (rc)
+ return rc;
return 1;
}