--- drivers/ide/ide.c~	Thu Nov 28 23:53:13 2002
+++ drivers/ide/ide.c	Sat Dec 21 18:25:59 2002
@@ -2456,7 +2456,6 @@
 	memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
 	hwif->irq = hw->irq;
 	hwif->noprobe = 0;
-	hwif->chipset = hw->chipset;
 
 	if (!initializing) {
 		ide_probe_module();
@@ -3427,12 +3426,16 @@
 		 * Cryptic check to ensure chipset not already set for hwif:
 		 */
 		if (i > 0 || i <= -11) {			/* is parameter a chipset name? */
-			if (hwif->chipset != ide_unknown)
+			if (hwif->chipset != ide_unknown) {
+				printk(" -- chipset already specified");
 				goto bad_option;	/* chipset already specified */
+			}
 			if (i <= -11 && i != -18 && hw != 0)
 				goto bad_hwif;		/* chipset drivers are for "ide0=" only */
-			if (i <= -11 && i != -18 && ide_hwifs[hw+1].chipset != ide_unknown)
+			if (i <= -11 && i != -18 && ide_hwifs[hw+1].chipset != ide_unknown) {
+				printk(" -- chipset for 2nd port already specified");
 				goto bad_option;	/* chipset for 2nd port already specified */
+			}
 			printk("\n");
 		}