X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=block%2Fblk-timeout.c;h=655ba909cd6a6c6826cb57be9055da25df3b8cec;hb=HEAD;hp=65f103563969bf32391c7bb3d6f4e4859ed1459a;hpb=a27eabf4a5098bfce4e2c6e8614de4706b42b864;p=karo-tx-linux.git

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 65f103563969..655ba909cd6a 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -91,8 +91,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:
 		/*
@@ -174,7 +174,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