git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pandora: defconfig: update
[pandora-kernel.git]
/
block
/
blk-timeout.c
diff --git
a/block/blk-timeout.c
b/block/blk-timeout.c
index
7803548
..
b1182ea
100644
(file)
--- 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_complete_request(req);
break;
case BLK_EH_RESET_TIMER:
- blk_clear_rq_complete(req);
blk_add_timer(req);
blk_add_timer(req);
+ blk_clear_rq_complete(req);
break;
case BLK_EH_NOT_HANDLED:
/*
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));
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
/*
* Some LLDs, like scsi, peek at the timeout to prevent a