diff options
Diffstat (limited to 'drivers/block/swim.c')
-rw-r--r-- | drivers/block/swim.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 97ef4266c4c7..fc6a1c322933 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c | |||
@@ -531,7 +531,7 @@ static void redo_fd_request(struct request_queue *q) | |||
531 | while ((req = elv_next_request(q))) { | 531 | while ((req = elv_next_request(q))) { |
532 | 532 | ||
533 | fs = req->rq_disk->private_data; | 533 | fs = req->rq_disk->private_data; |
534 | if (req->sector < 0 || req->sector >= fs->total_secs) { | 534 | if (blk_rq_pos(req) >= fs->total_secs) { |
535 | __blk_end_request_cur(req, -EIO); | 535 | __blk_end_request_cur(req, -EIO); |
536 | continue; | 536 | continue; |
537 | } | 537 | } |
@@ -551,8 +551,8 @@ static void redo_fd_request(struct request_queue *q) | |||
551 | __blk_end_request_cur(req, -EIO); | 551 | __blk_end_request_cur(req, -EIO); |
552 | break; | 552 | break; |
553 | case READ: | 553 | case READ: |
554 | if (floppy_read_sectors(fs, req->sector, | 554 | if (floppy_read_sectors(fs, blk_rq_pos(req), |
555 | req->current_nr_sectors, | 555 | blk_rq_cur_sectors(req), |
556 | req->buffer)) { | 556 | req->buffer)) { |
557 | __blk_end_request_cur(req, -EIO); | 557 | __blk_end_request_cur(req, -EIO); |
558 | continue; | 558 | continue; |