diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 5625946739ad..f56e9a918b99 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -244,6 +244,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, | |||
244 | { | 244 | { |
245 | struct ide_disk_obj *floppy = drive->driver_data; | 245 | struct ide_disk_obj *floppy = drive->driver_data; |
246 | ide_hwif_t *hwif = drive->hwif; | 246 | ide_hwif_t *hwif = drive->hwif; |
247 | struct ide_cmd *cmd = &hwif->cmd; | ||
247 | struct ide_atapi_pc *pc; | 248 | struct ide_atapi_pc *pc; |
248 | 249 | ||
249 | if (drive->debug_mask & IDE_DBG_RQ) | 250 | if (drive->debug_mask & IDE_DBG_RQ) |
@@ -285,12 +286,12 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, | |||
285 | } | 286 | } |
286 | 287 | ||
287 | if (blk_fs_request(rq) || pc->req_xfer) { | 288 | if (blk_fs_request(rq) || pc->req_xfer) { |
288 | ide_init_sg_cmd(drive, rq); | 289 | ide_init_sg_cmd(cmd, rq->nr_sectors); |
289 | ide_map_sg(drive, rq); | 290 | ide_map_sg(drive, rq); |
290 | } | 291 | } |
291 | 292 | ||
292 | pc->sg = hwif->sg_table; | 293 | pc->sg = hwif->sg_table; |
293 | pc->sg_cnt = hwif->sg_nents; | 294 | pc->sg_cnt = cmd->sg_nents; |
294 | 295 | ||
295 | pc->rq = rq; | 296 | pc->rq = rq; |
296 | 297 | ||