git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-video' and 'acpi-x86'
[sfrench/cifs-2.6.git]
/
drivers
/
base
/
power
/
runtime.c
diff --git
a/drivers/base/power/runtime.c
b/drivers/base/power/runtime.c
index 0ea2139c50d875d0fdce8e9fb55374fd6bdc337b..ccd296dbb95c4a406b2047876a63ca812ed082f6 100644
(file)
--- a/
drivers/base/power/runtime.c
+++ b/
drivers/base/power/runtime.c
@@
-95,7
+95,7
@@
static void __update_runtime_status(struct device *dev, enum rpm_status status)
static void pm_runtime_deactivate_timer(struct device *dev)
{
if (dev->power.timer_expires > 0) {
- hrtimer_cancel(&dev->power.suspend_timer);
+ hrtimer_
try_to_
cancel(&dev->power.suspend_timer);
dev->power.timer_expires = 0;
}
}