aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-taskfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r--drivers/ide/ide-taskfile.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 63ab233ba942..286804142e4d 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -140,7 +140,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
140 } else if (custom && tf->command == ATA_CMD_INIT_DEV_PARAMS) { 140 } else if (custom && tf->command == ATA_CMD_INIT_DEV_PARAMS) {
141 if ((stat & (ATA_ERR | ATA_DRQ)) == 0) { 141 if ((stat & (ATA_ERR | ATA_DRQ)) == 0) {
142 ide_set_handler(drive, &task_no_data_intr, 142 ide_set_handler(drive, &task_no_data_intr,
143 WAIT_WORSTCASE, NULL); 143 WAIT_WORSTCASE);
144 return ide_started; 144 return ide_started;
145 } 145 }
146 } 146 }
@@ -347,7 +347,7 @@ static ide_startstop_t task_pio_intr(ide_drive_t *drive)
347 } 347 }
348out_wait: 348out_wait:
349 /* Still data left to transfer. */ 349 /* Still data left to transfer. */
350 ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL); 350 ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
351 return ide_started; 351 return ide_started;
352out_end: 352out_end:
353 if ((cmd->tf_flags & IDE_TFLAG_FS) == 0) 353 if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
@@ -377,7 +377,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
377 if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0) 377 if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)
378 local_irq_disable(); 378 local_irq_disable();
379 379
380 ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL); 380 ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
381 381
382 ide_pio_datablock(drive, cmd, 1); 382 ide_pio_datablock(drive, cmd, 1);
383 383