diff options
author | Borislav Petkov <petkovbb@googlemail.com> | 2008-07-23 13:55:59 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:59 -0400 |
commit | 776bb0270ea72c40f95347dcac868c9f602dcb3e (patch) | |
tree | d2fee8593384df75c4a7c2ff70e4bb39eb670e15 /drivers/ide/ide-atapi.c | |
parent | 2207fa5af1507ea018fc95e777276edb1ca5601a (diff) |
ide-tape: use drive->pc_callback instead of pc->callback
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>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r-- | drivers/ide/ide-atapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 0c4f45247d86..d5249dfc5546 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
@@ -31,7 +31,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, | |||
31 | debug_log("Enter %s - interrupt handler\n", __func__); | 31 | debug_log("Enter %s - interrupt handler\n", __func__); |
32 | 32 | ||
33 | if (pc->flags & PC_FLAG_TIMEDOUT) { | 33 | if (pc->flags & PC_FLAG_TIMEDOUT) { |
34 | if (drive->media == ide_floppy) | 34 | if (drive->media == ide_floppy || drive->media == ide_tape) |
35 | drive->pc_callback(drive); | 35 | drive->pc_callback(drive); |
36 | else | 36 | else |
37 | pc->callback(drive); | 37 | pc->callback(drive); |
@@ -100,7 +100,7 @@ cmd_finished: | |||
100 | return ide_stopped; | 100 | return ide_stopped; |
101 | } | 101 | } |
102 | /* Command finished - Call the callback function */ | 102 | /* Command finished - Call the callback function */ |
103 | if (drive->media == ide_floppy) | 103 | if (drive->media == ide_floppy || drive->media == ide_tape) |
104 | drive->pc_callback(drive); | 104 | drive->pc_callback(drive); |
105 | else | 105 | else |
106 | pc->callback(drive); | 106 | pc->callback(drive); |