diff options
Diffstat (limited to 'drivers/ide/h8300/ide-h8300.c')
-rw-r--r-- | drivers/ide/h8300/ide-h8300.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c index ecf53bb0d2aa..ae37ee58bae2 100644 --- a/drivers/ide/h8300/ide-h8300.c +++ b/drivers/ide/h8300/ide-h8300.c | |||
@@ -52,8 +52,6 @@ static void h8300_tf_load(ide_drive_t *drive, ide_task_t *task) | |||
52 | if (task->tf_flags & IDE_TFLAG_FLAGGED) | 52 | if (task->tf_flags & IDE_TFLAG_FLAGGED) |
53 | HIHI = 0xFF; | 53 | HIHI = 0xFF; |
54 | 54 | ||
55 | ide_set_irq(drive, 1); | ||
56 | |||
57 | if (task->tf_flags & IDE_TFLAG_OUT_DATA) | 55 | if (task->tf_flags & IDE_TFLAG_OUT_DATA) |
58 | mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr); | 56 | mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr); |
59 | 57 | ||
@@ -98,7 +96,7 @@ static void h8300_tf_read(ide_drive_t *drive, ide_task_t *task) | |||
98 | } | 96 | } |
99 | 97 | ||
100 | /* be sure we're looking at the low order bits */ | 98 | /* be sure we're looking at the low order bits */ |
101 | outb(drive->ctl & ~0x80, io_ports->ctl_addr); | 99 | outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); |
102 | 100 | ||
103 | if (task->tf_flags & IDE_TFLAG_IN_NSECT) | 101 | if (task->tf_flags & IDE_TFLAG_IN_NSECT) |
104 | tf->nsect = inb(io_ports->nsect_addr); | 102 | tf->nsect = inb(io_ports->nsect_addr); |
@@ -112,7 +110,7 @@ static void h8300_tf_read(ide_drive_t *drive, ide_task_t *task) | |||
112 | tf->device = inb(io_ports->device_addr); | 110 | tf->device = inb(io_ports->device_addr); |
113 | 111 | ||
114 | if (task->tf_flags & IDE_TFLAG_LBA48) { | 112 | if (task->tf_flags & IDE_TFLAG_LBA48) { |
115 | outb(drive->ctl | 0x80, io_ports->ctl_addr); | 113 | outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); |
116 | 114 | ||
117 | if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) | 115 | if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) |
118 | tf->hob_feature = inb(io_ports->feature_addr); | 116 | tf->hob_feature = inb(io_ports->feature_addr); |