diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index a775450d7a38..04a357808f2e 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -612,18 +612,18 @@ static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, uns | |||
| 612 | int count, done = 0; | 612 | int count, done = 0; |
| 613 | 613 | ||
| 614 | rq_for_each_segment(bvec, rq, iter) { | 614 | rq_for_each_segment(bvec, rq, iter) { |
| 615 | if (!bcount) | 615 | if (!bcount) |
| 616 | break; | 616 | break; |
| 617 | 617 | ||
| 618 | count = min(bvec->bv_len, bcount); | 618 | count = min(bvec->bv_len, bcount); |
| 619 | 619 | ||
| 620 | data = bvec_kmap_irq(bvec, &flags); | 620 | data = bvec_kmap_irq(bvec, &flags); |
| 621 | drive->hwif->atapi_input_bytes(drive, data, count); | 621 | drive->hwif->atapi_input_bytes(drive, data, count); |
| 622 | bvec_kunmap_irq(data, &flags); | 622 | bvec_kunmap_irq(data, &flags); |
| 623 | 623 | ||
| 624 | bcount -= count; | 624 | bcount -= count; |
| 625 | pc->b_count += count; | 625 | pc->b_count += count; |
| 626 | done += count; | 626 | done += count; |
| 627 | } | 627 | } |
| 628 | 628 | ||
| 629 | idefloppy_do_end_request(drive, 1, done >> 9); | 629 | idefloppy_do_end_request(drive, 1, done >> 9); |
| @@ -644,18 +644,18 @@ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, un | |||
| 644 | char *data; | 644 | char *data; |
| 645 | 645 | ||
| 646 | rq_for_each_segment(bvec, rq, iter) { | 646 | rq_for_each_segment(bvec, rq, iter) { |
| 647 | if (!bcount) | 647 | if (!bcount) |
| 648 | break; | 648 | break; |
| 649 | 649 | ||
| 650 | count = min(bvec->bv_len, bcount); | 650 | count = min(bvec->bv_len, bcount); |
| 651 | 651 | ||
| 652 | data = bvec_kmap_irq(bvec, &flags); | 652 | data = bvec_kmap_irq(bvec, &flags); |
| 653 | drive->hwif->atapi_output_bytes(drive, data, count); | 653 | drive->hwif->atapi_output_bytes(drive, data, count); |
| 654 | bvec_kunmap_irq(data, &flags); | 654 | bvec_kunmap_irq(data, &flags); |
| 655 | 655 | ||
| 656 | bcount -= count; | 656 | bcount -= count; |
| 657 | pc->b_count += count; | 657 | pc->b_count += count; |
| 658 | done += count; | 658 | done += count; |
| 659 | } | 659 | } |
| 660 | 660 | ||
| 661 | idefloppy_do_end_request(drive, 1, done >> 9); | 661 | idefloppy_do_end_request(drive, 1, done >> 9); |