projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
clocksource
/
acpi_pm.c
diff --git
a/drivers/clocksource/acpi_pm.c
b/drivers/clocksource/acpi_pm.c
index 6efe4d1ab3aa7939cf4f431ca0891f4290b807c0..6eab8898567031cf0e6519ec6d0d970340fc1705 100644
(file)
--- a/
drivers/clocksource/acpi_pm.c
+++ b/
drivers/clocksource/acpi_pm.c
@@
-200,14
+200,14
@@
static int __init init_acpi_pm_clocksource(void)
if ((value2 < value1) && ((value2) < 0xFFF))
break;
printk(KERN_INFO "PM-Timer had inconsistent results:"
if ((value2 < value1) && ((value2) < 0xFFF))
break;
printk(KERN_INFO "PM-Timer had inconsistent results:"
- "
0x%#llx, 0x
%#llx - aborting.\n",
+ "
%#llx,
%#llx - aborting.\n",
value1, value2);
pmtmr_ioport = 0;
return -EINVAL;
}
if (i == ACPI_PM_READ_CHECKS) {
printk(KERN_INFO "PM-Timer failed consistency check "
value1, value2);
pmtmr_ioport = 0;
return -EINVAL;
}
if (i == ACPI_PM_READ_CHECKS) {
printk(KERN_INFO "PM-Timer failed consistency check "
- " (
0x
%#llx) - aborting.\n", value1);
+ " (%#llx) - aborting.\n", value1);
pmtmr_ioport = 0;
return -ENODEV;
}
pmtmr_ioport = 0;
return -ENODEV;
}