aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-floppy.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 44b53896f105..cbf84f2e9cce 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -291,6 +291,7 @@ static void idefloppy_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc,
291 rq->cmd_type = REQ_TYPE_SPECIAL; 291 rq->cmd_type = REQ_TYPE_SPECIAL;
292 rq->cmd_flags |= REQ_PREEMPT; 292 rq->cmd_flags |= REQ_PREEMPT;
293 rq->rq_disk = floppy->disk; 293 rq->rq_disk = floppy->disk;
294 memcpy(rq->cmd, pc->c, 12);
294 ide_do_drive_cmd(drive, rq); 295 ide_do_drive_cmd(drive, rq);
295} 296}
296 297
@@ -573,6 +574,8 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
573 put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]); 574 put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
574 put_unaligned(cpu_to_be32(block), (unsigned int *) &pc->c[2]); 575 put_unaligned(cpu_to_be32(block), (unsigned int *) &pc->c[2]);
575 576
577 memcpy(rq->cmd, pc->c, 12);
578
576 pc->rq = rq; 579 pc->rq = rq;
577 pc->b_count = cmd == READ ? 0 : rq->bio->bi_size; 580 pc->b_count = cmd == READ ? 0 : rq->bio->bi_size;
578 if (rq->cmd_flags & REQ_RW) 581 if (rq->cmd_flags & REQ_RW)
@@ -670,6 +673,7 @@ static int idefloppy_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc)
670 rq = blk_get_request(drive->queue, READ, __GFP_WAIT); 673 rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
671 rq->buffer = (char *) pc; 674 rq->buffer = (char *) pc;
672 rq->cmd_type = REQ_TYPE_SPECIAL; 675 rq->cmd_type = REQ_TYPE_SPECIAL;
676 memcpy(rq->cmd, pc->c, 12);
673 error = blk_execute_rq(drive->queue, floppy->disk, rq, 0); 677 error = blk_execute_rq(drive->queue, floppy->disk, rq, 0);
674 blk_put_request(rq); 678 blk_put_request(rq);
675 679