patch-2.3.16 linux/drivers/block/trm290.c

• Lines: 18
• Date: Thu Aug 26 13:44:03 1999
• Orig file: v2.3.15/linux/drivers/block/trm290.c
• Orig date: Mon Aug 9 10:23:09 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/block/trm290.c linux/drivers/block/trm290.c
@@ -263,7 +263,16 @@
 		old = inw(hwif->config_data) & ~1;
 		if (old != compat && inb(old+2) == 0xff) {
 			compat += (next_offset += 0x400);	/* leave lower 10 bits untouched */
-			hwif->io_ports[IDE_CONTROL_OFFSET] = compat + 2;	/* FIXME: should do a check_region */
+#if 1
+			if (ide_check_region(compat + 2, 1))
+				printk("Aieee %s: ide_check_region failure at 0x%04x\n", hwif->name, (compat + 2));
+			/*
+			 * The region check is not needed; however.........
+			 * Since this is the checked in ide-probe.c,
+			 * this is only an assignment.
+			 */
+#endif
+			hwif->io_ports[IDE_CONTROL_OFFSET] = compat + 2;
 			outw(compat|1, hwif->config_data);
 			printk("%s: control basereg workaround: old=0x%04x, new=0x%04x\n", hwif->name, old, inw(hwif->config_data) & ~1);
 		}