patch-2.4.0-test10 linux/drivers/pcmcia/yenta.c

• Lines: 25
• Date: Mon Oct 30 21:38:34 2000
• Orig file: v2.4.0-test9/linux/drivers/pcmcia/yenta.c
• Orig date: Sun Oct 8 10:50:21 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/pcmcia/yenta.c linux/drivers/pcmcia/yenta.c
@@ -256,11 +256,13 @@
 	}  else {
 		u8 reg;
 
-		bridge |= CB_BRIDGE_INTR;
 		reg = exca_readb(socket, I365_INTCTL) & (I365_RING_ENA | I365_INTR_ENA);
 		reg |= (state->flags & SS_RESET) ? 0 : I365_PC_RESET;
 		reg |= (state->flags & SS_IOCARD) ? I365_PC_IOCARD : 0;
-		reg |= state->io_irq;
+		if (state->io_irq != socket->cb_irq) {
+			reg |= state->io_irq;
+			bridge |= CB_BRIDGE_INTR;
+		}
 		exca_writeb(socket, I365_INTCTL, reg);
 
 		reg = exca_readb(socket, I365_POWER) & (I365_VCC_MASK|I365_VPP1_MASK);
@@ -626,7 +628,7 @@
 			PCI_COMMAND_WAIT);
 
 	/* MAGIC NUMBERS! Fixme */
-	config_writeb(socket, PCI_CACHE_LINE_SIZE, 32);
+	config_writeb(socket, PCI_CACHE_LINE_SIZE, L1_CACHE_BYTES / 4);
 	config_writeb(socket, PCI_LATENCY_TIMER, 168);
 	config_writeb(socket, PCI_SEC_LATENCY_TIMER, 176);
 	config_writeb(socket, PCI_PRIMARY_BUS, dev->bus->number);