aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ide-scsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/ide-scsi.c')
-rw-r--r--drivers/scsi/ide-scsi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 2a86af91f64a..659db3f7ae08 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -142,7 +142,8 @@ static void ide_scsi_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
142 unsigned int bcount, int write) 142 unsigned int bcount, int write)
143{ 143{
144 ide_hwif_t *hwif = drive->hwif; 144 ide_hwif_t *hwif = drive->hwif;
145 xfer_func_t *xf = write ? hwif->output_data : hwif->input_data; 145 const struct ide_tp_ops *tp_ops = hwif->tp_ops;
146 xfer_func_t *xf = write ? tp_ops->output_data : tp_ops->input_data;
146 char *buf; 147 char *buf;
147 int count; 148 int count;
148 149
@@ -246,9 +247,9 @@ idescsi_atapi_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err)
246{ 247{
247 ide_hwif_t *hwif = drive->hwif; 248 ide_hwif_t *hwif = drive->hwif;
248 249
249 if (hwif->read_status(hwif) & (BUSY_STAT | DRQ_STAT)) 250 if (hwif->tp_ops->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
250 /* force an abort */ 251 /* force an abort */
251 hwif->exec_command(hwif, WIN_IDLEIMMEDIATE); 252 hwif->tp_ops->exec_command(hwif, WIN_IDLEIMMEDIATE);
252 253
253 rq->errors++; 254 rq->errors++;
254 255