summaryrefslogtreecommitdiff
path: root/kernel/power/qos.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-30 00:46:48 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-30 00:46:48 +0400
commit170bb4c800d2b65df52f37400fb20276273650d8 (patch)
tree86ff97efaeeac6e8533feb4899ec674ddbc0a065 /kernel/power/qos.c
parent64adb0192ff309051492b34139bb842024ebb119 (diff)
parente5f5762177be52fde50ccba88938d66b5103c8e0 (diff)
downloadlinux-170bb4c800d2b65df52f37400fb20276273650d8.tar.xz
Merge branch 'pm-sleep'
* pm-sleep: PM / Freezer: Fixup compile error of try_to_freeze_nowarn() driver core / PM: move the calling to device_pm_remove behind the calling to bus_remove_device PM / Hibernate: use rb_entry PM / sysfs: replace strict_str* with kstrto*
Diffstat (limited to 'kernel/power/qos.c')
-rw-r--r--kernel/power/qos.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 2ab2819aee65..9322ff7eaad6 100644
--- a/kernel/power/qos.c
+++ b/kernel/power/qos.c
@@ -563,7 +563,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
} else {
ascii_value[count] = '\0';
}
- ret = strict_strtoul(ascii_value, 16, &ulval);
+ ret = kstrtoul(ascii_value, 16, &ulval);
if (ret) {
pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
return -EINVAL;