Merge branch 'pm-sleep-next' into linux-next

[karo-tx-linux.git] / kernel / power / qos.c

diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 2ab2819aee655d2e54b94b5037c66a9b7be77960..9322ff7eaad68d41512763d3b337d123601f32b7 100644 (file)
--- 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;