mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-06 14:31:46 +00:00
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*
This commit is contained in:
commit
170bb4c800
5 changed files with 5 additions and 4 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue