aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-floppy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r--drivers/ide/ide-floppy.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 14e5e9ca2ad9..800c83a9db83 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -210,8 +210,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,
210 pc->rq = rq; 210 pc->rq = rq;
211 if (rq->cmd_flags & REQ_RW) 211 if (rq->cmd_flags & REQ_RW)
212 pc->flags |= PC_FLAG_WRITING; 212 pc->flags |= PC_FLAG_WRITING;
213 pc->buf = NULL; 213
214 pc->buf_size = blk_rq_bytes(rq);
215 pc->flags |= PC_FLAG_DMA_OK; 214 pc->flags |= PC_FLAG_DMA_OK;
216} 215}
217 216
@@ -226,9 +225,6 @@ static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,
226 if (rq_data_dir(rq) == WRITE) 225 if (rq_data_dir(rq) == WRITE)
227 pc->flags |= PC_FLAG_WRITING; 226 pc->flags |= PC_FLAG_WRITING;
228 } 227 }
229 /* pio will be performed by ide_pio_bytes() which handles sg fine */
230 pc->buf = NULL;
231 pc->buf_size = blk_rq_bytes(rq);
232} 228}
233 229
234static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, 230static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
@@ -388,8 +384,6 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
388 drive->capacity64 = 0; 384 drive->capacity64 = 0;
389 385
390 ide_floppy_create_read_capacity_cmd(&pc); 386 ide_floppy_create_read_capacity_cmd(&pc);
391 pc.buf_size = sizeof(pc_buf);
392
393 if (ide_queue_pc_tail(drive, disk, &pc, pc_buf, pc.req_xfer)) { 387 if (ide_queue_pc_tail(drive, disk, &pc, pc_buf, pc.req_xfer)) {
394 printk(KERN_ERR PFX "Can't get floppy parameters\n"); 388 printk(KERN_ERR PFX "Can't get floppy parameters\n");
395 return 1; 389 return 1;