summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-05-09 23:32:08 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-09 23:32:08 +0200
commit317cf7e5e85e3ef9f23fc6dd8b2945ab4a258140 (patch)
treeb8d131822e076da6c1eec8b0358340dbe504d8d0 /kernel/power
parent8a54cd5bd6ebf009b96ec79510b593f7ba5c0ff3 (diff)
downloadlinux-stable-317cf7e5e85e3ef9f23fc6dd8b2945ab4a258140.tar.gz
linux-stable-317cf7e5e85e3ef9f23fc6dd8b2945ab4a258140.tar.bz2
linux-stable-317cf7e5e85e3ef9f23fc6dd8b2945ab4a258140.zip
PM / hibernate: convert simple_strtoul to kstrtoul
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>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/hibernate.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 1f08ac7f55d8..2377ff72994c 100644
--- 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;
}