projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers/posix-cpu-timers-for-tglx' of
[cascardo/linux.git]
/
block
/
blk-core.c
diff --git
a/block/blk-core.c
b/block/blk-core.c
index
33c33bc
..
d5745b5
100644
(file)
--- a/
block/blk-core.c
+++ b/
block/blk-core.c
@@
-3164,7
+3164,7
@@
void blk_post_runtime_resume(struct request_queue *q, int err)
q->rpm_status = RPM_ACTIVE;
__blk_run_queue(q);
pm_runtime_mark_last_busy(q->dev);
- pm_r
untime
_autosuspend(q->dev);
+ pm_r
equest
_autosuspend(q->dev);
} else {
q->rpm_status = RPM_SUSPENDED;
}