diff options
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-atapi.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index d5249dfc5546..0e9eeb08da2d 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
| @@ -31,10 +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 || drive->media == ide_tape) | 34 | drive->pc_callback(drive); |
| 35 | drive->pc_callback(drive); | ||
| 36 | else | ||
| 37 | pc->callback(drive); | ||
| 38 | return ide_stopped; | 35 | return ide_stopped; |
| 39 | } | 36 | } |
| 40 | 37 | ||
| @@ -100,10 +97,7 @@ cmd_finished: | |||
| 100 | return ide_stopped; | 97 | return ide_stopped; |
| 101 | } | 98 | } |
| 102 | /* Command finished - Call the callback function */ | 99 | /* Command finished - Call the callback function */ |
| 103 | if (drive->media == ide_floppy || drive->media == ide_tape) | 100 | drive->pc_callback(drive); |
| 104 | drive->pc_callback(drive); | ||
| 105 | else | ||
| 106 | pc->callback(drive); | ||
| 107 | return ide_stopped; | 101 | return ide_stopped; |
| 108 | } | 102 | } |
| 109 | 103 | ||