From 20e21cc7a8f0f7b34cece619e705e726960bcc24 Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Fri, 17 May 2013 15:47:20 +0800 Subject: [PATCH] --- yaml --- r: 376991 b: refs/heads/master c: c60855cdb976c632b3bf8922eeab8a0e78edfc04 h: refs/heads/master i: 376989: e5aca1a0c0535d2a84f53b58be01c4d49858304b 376987: 887618a06d1c5dad019de1d10192b0a80a8eeba2 376983: d30fd2578ce487e5b583fc5c7e84f5f099634381 376975: d8de91b46121c983539758fbe31afac5afc41b57 376959: 3f0d9f7aa136721949d33b0602678e028166bf57 v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c2dbb6d957b..b295561ed5ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0a363f5cf21f79d72ab630524c3aa06fc6d066c +refs/heads/master: c60855cdb976c632b3bf8922eeab8a0e78edfc04 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 33c33bc99ddd..d5745b5833c9 100644 --- a/trunk/block/blk-core.c +++ b/trunk/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_runtime_autosuspend(q->dev); + pm_request_autosuspend(q->dev); } else { q->rpm_status = RPM_SUSPENDED; }