aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-tape.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r--drivers/ide/ide-tape.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 353dd11b9283..ef54728a74b0 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -927,11 +927,12 @@ static void idetape_create_mode_sense_cmd(struct ide_atapi_pc *pc, u8 page_code)
927 927
928static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive) 928static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive)
929{ 929{
930 ide_hwif_t *hwif = drive->hwif;
930 idetape_tape_t *tape = drive->driver_data; 931 idetape_tape_t *tape = drive->driver_data;
931 struct ide_atapi_pc *pc = tape->pc; 932 struct ide_atapi_pc *pc = tape->pc;
932 u8 stat; 933 u8 stat;
933 934
934 stat = ide_read_status(drive); 935 stat = hwif->read_status(hwif);
935 936
936 if (stat & SEEK_STAT) { 937 if (stat & SEEK_STAT) {
937 if (stat & ERR_STAT) { 938 if (stat & ERR_STAT) {
@@ -980,6 +981,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape,
980static ide_startstop_t idetape_do_request(ide_drive_t *drive, 981static ide_startstop_t idetape_do_request(ide_drive_t *drive,
981 struct request *rq, sector_t block) 982 struct request *rq, sector_t block)
982{ 983{
984 ide_hwif_t *hwif = drive->hwif;
983 idetape_tape_t *tape = drive->driver_data; 985 idetape_tape_t *tape = drive->driver_data;
984 struct ide_atapi_pc *pc = NULL; 986 struct ide_atapi_pc *pc = NULL;
985 struct request *postponed_rq = tape->postponed_rq; 987 struct request *postponed_rq = tape->postponed_rq;
@@ -1017,7 +1019,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
1017 * If the tape is still busy, postpone our request and service 1019 * If the tape is still busy, postpone our request and service
1018 * the other device meanwhile. 1020 * the other device meanwhile.
1019 */ 1021 */
1020 stat = ide_read_status(drive); 1022 stat = hwif->read_status(hwif);
1021 1023
1022 if (!drive->dsc_overlap && !(rq->cmd[0] & REQ_IDETAPE_PC2)) 1024 if (!drive->dsc_overlap && !(rq->cmd[0] & REQ_IDETAPE_PC2))
1023 set_bit(IDETAPE_FLAG_IGNORE_DSC, &tape->flags); 1025 set_bit(IDETAPE_FLAG_IGNORE_DSC, &tape->flags);