From dfc20f6f05bd65f69103fb624ecc1c1b77cedefe Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 13 Jun 2015 21:44:58 +0200 Subject: [PATCH] ide_isa: integrate fix for #2880 This was fixed in 2008 in the ide_pci driver, but has never been merged in ide_isa. It probably won't matter as machine with IDE on the ISA bus are unlikely to run Haiku. Thanks to philcostin for finding the problem using cppcheck. --- src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c b/src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c index 80e1d405da..3eaa40c7ed 100644 --- a/src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c +++ b/src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c @@ -120,7 +120,7 @@ write_command_block_regs(void *channel_cookie, ata_task_file *tf, return B_ERROR; for (i = 0; i < 7; i++) { - if (((1 << (i-7)) & mask) != 0) { + if (((1 << (i + 7)) & mask) != 0) { TRACE("write_command_block_regs(): %x->HI(%x)\n", tf->raw.r[i + 7], i); channel->isa->write_io_8(ioaddr + 1 + i, tf->raw.r[i + 7]);