X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=block%2Fblk-timeout.c;h=5a6296ef9a81e62c4a074fa1e5a80f0b0cce3b26;hb=5cb0174119e4743c9f4b8f17115a8a2386c0f4a2;hp=6e4744cbfb56b4ca0d99062a0d9b0437c894016d;hpb=e05dd97c5c345bd1f6ce9f6fc242326a64191239;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 6e4744cbfb56..5a6296ef9a81 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -90,8 +90,8 @@ static void blk_rq_timed_out(struct request *req)
 		__blk_complete_request(req);
 		break;
 	case BLK_EH_RESET_TIMER:
-		blk_clear_rq_complete(req);
 		blk_add_timer(req);
+		blk_clear_rq_complete(req);
 		break;
 	case BLK_EH_NOT_HANDLED:
 		/*
@@ -173,7 +173,6 @@ void blk_add_timer(struct request *req)
 		return;
 
 	BUG_ON(!list_empty(&req->timeout_list));
-	BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags));
 
 	/*
 	 * Some LLDs, like scsi, peek at the timeout to prevent a