X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=block%2Fblk-core.c;h=10e8a64a5a5b1b213cbc2886755b22dedce76313;hb=d8af8582c321414087ed46512ffe5ce4f5c9c5da;hp=c3df30cfb3fc332d5a503677b5b383dcf2660ec2;hpb=921974982a7aab561a1c3ff1763af7470874ba8e;p=linux-2.6-omap-h63xx.git

diff --git a/block/blk-core.c b/block/blk-core.c
index c3df30cfb3f..10e8a64a5a5 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1770,8 +1770,6 @@ static void end_that_request_last(struct request *req, int error)
 {
 	struct gendisk *disk = req->rq_disk;
 
-	blk_delete_timer(req);
-
 	if (blk_rq_tagged(req))
 		blk_queue_end_tag(req->q, req);
 
@@ -1781,6 +1779,8 @@ static void end_that_request_last(struct request *req, int error)
 	if (unlikely(laptop_mode) && blk_fs_request(req))
 		laptop_io_completion();
 
+	blk_delete_timer(req);
+
 	/*
 	 * Account IO completion.  bar_rq isn't accounted as a normal
 	 * IO on queueing nor completion.  Accounting the containing