projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-fixes-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
block
/
blk-timeout.c
diff --git
a/block/blk-timeout.c
b/block/blk-timeout.c
index
bba81c9
..
d96f706
100644
(file)
--- a/
block/blk-timeout.c
+++ b/
block/blk-timeout.c
@@
-91,7
+91,7
@@
static void blk_rq_timed_out(struct request *req)
case BLK_EH_HANDLED:
/* Can we use req->errors here? */
if (q->mq_ops)
-
blk_mq_complete_request(req, req->errors
);
+
__blk_mq_complete_request(req
);
else
__blk_complete_request(req);
break;