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/block/viodasd.c | |
| 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/block/viodasd.c')
| -rw-r--r-- | drivers/block/viodasd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 2d518aa2720a..063f0304a163 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c | |||
| @@ -305,7 +305,7 @@ static void viodasd_end_request(struct request *req, int uptodate, | |||
| 305 | if (end_that_request_first(req, uptodate, num_sectors)) | 305 | if (end_that_request_first(req, uptodate, num_sectors)) |
| 306 | return; | 306 | return; |
| 307 | add_disk_randomness(req->rq_disk); | 307 | add_disk_randomness(req->rq_disk); |
| 308 | end_that_request_last(req); | 308 | end_that_request_last(req, uptodate); |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | /* | 311 | /* |