diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-03-14 05:26:45 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-03-14 05:26:45 -0400 |
| commit | 9e294427f6e427dbaf46140303acded06365f53c (patch) | |
| tree | 0669100cbd79fe8612463900171c98873d8dc454 /block/blk-timeout.c | |
| parent | 23600969ff137cf4c3bc9098f77e381de334e3f7 (diff) | |
| parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
Merge tag 'v3.14-rc6' into devel
Linux 3.14-rc6
Diffstat (limited to 'block/blk-timeout.c')
| -rw-r--r-- | block/blk-timeout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index bba81c9348e1..d96f7061c6fd 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c | |||
| @@ -91,7 +91,7 @@ static void blk_rq_timed_out(struct request *req) | |||
| 91 | case BLK_EH_HANDLED: | 91 | case BLK_EH_HANDLED: |
| 92 | /* Can we use req->errors here? */ | 92 | /* Can we use req->errors here? */ |
| 93 | if (q->mq_ops) | 93 | if (q->mq_ops) |
| 94 | blk_mq_complete_request(req, req->errors); | 94 | __blk_mq_complete_request(req); |
| 95 | else | 95 | else |
| 96 | __blk_complete_request(req); | 96 | __blk_complete_request(req); |
| 97 | break; | 97 | break; |