The if-else block in the IRQ handler is only temporary so that bisect searches
don't break and it'll be removed after converting the remainder of the drivers.
There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
debug_log("Enter %s - interrupt handler\n", __func__);
if (pc->flags & PC_FLAG_TIMEDOUT) {
debug_log("Enter %s - interrupt handler\n", __func__);
if (pc->flags & PC_FLAG_TIMEDOUT) {
- if (drive->media == ide_floppy)
+ if (drive->media == ide_floppy || drive->media == ide_tape)
drive->pc_callback(drive);
else
pc->callback(drive);
drive->pc_callback(drive);
else
pc->callback(drive);
return ide_stopped;
}
/* Command finished - Call the callback function */
return ide_stopped;
}
/* Command finished - Call the callback function */
- if (drive->media == ide_floppy)
+ if (drive->media == ide_floppy || drive->media == ide_tape)
drive->pc_callback(drive);
else
pc->callback(drive);
drive->pc_callback(drive);
else
pc->callback(drive);
pc->buf_size = IDETAPE_PC_BUFFER_SIZE;
pc->bh = NULL;
pc->b_data = NULL;
pc->buf_size = IDETAPE_PC_BUFFER_SIZE;
pc->bh = NULL;
pc->b_data = NULL;
- pc->callback = ide_tape_callback;
}
static void idetape_create_request_sense_cmd(struct ide_atapi_pc *pc)
}
static void idetape_create_request_sense_cmd(struct ide_atapi_pc *pc)
pc->error = IDETAPE_ERROR_GENERAL;
}
tape->failed_pc = NULL;
pc->error = IDETAPE_ERROR_GENERAL;
}
tape->failed_pc = NULL;
+ drive->pc_callback(drive);
return ide_stopped;
}
debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);
return ide_stopped;
}
debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);
pc->error = IDETAPE_ERROR_GENERAL;
tape->failed_pc = NULL;
}
pc->error = IDETAPE_ERROR_GENERAL;
tape->failed_pc = NULL;
}
+ drive->pc_callback(drive);
u8 gcw[2];
u16 *ctl = (u16 *)&tape->caps[12];
u8 gcw[2];
u16 *ctl = (u16 *)&tape->caps[12];
+ drive->pc_callback = ide_tape_callback;
+
spin_lock_init(&tape->lock);
drive->dsc_overlap = 1;
if (drive->hwif->host_flags & IDE_HFLAG_NO_DSC) {
spin_lock_init(&tape->lock);
drive->dsc_overlap = 1;
if (drive->hwif->host_flags & IDE_HFLAG_NO_DSC) {