diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 12:01:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 12:01:25 -0500 |
| commit | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (patch) | |
| tree | 415aefe6d168df27c006fcc53b1ea5242eabaaea /drivers/message | |
| parent | 7ed40918a386afc2e14a6d3da563ea6d13686c25 (diff) | |
| parent | e650c305ec3178818b317dad37a6d9c7fa8ba28d (diff) | |
Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block
Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b847548663ef1039dd49f0eb4463d001e596bc3.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/i2o/i2o_block.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index c5807d6e85cc..5b1febed3133 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
| @@ -468,7 +468,7 @@ static void i2o_block_end_request(struct request *req, int uptodate, | |||
| 468 | 468 | ||
| 469 | spin_lock_irqsave(q->queue_lock, flags); | 469 | spin_lock_irqsave(q->queue_lock, flags); |
| 470 | 470 | ||
| 471 | end_that_request_last(req); | 471 | end_that_request_last(req, uptodate); |
| 472 | 472 | ||
| 473 | if (likely(dev)) { | 473 | if (likely(dev)) { |
| 474 | dev->open_queue_depth--; | 474 | dev->open_queue_depth--; |