patch-2.0.35 linux/drivers/net/smc-ultra32.c

• Lines: 29
• Date: Mon Jul 13 13:47:31 1998
• Orig file: v2.0.34/linux/drivers/net/smc-ultra32.c
• Orig date: Mon Jul 13 13:46:30 1998

diff -u --recursive --new-file v2.0.34/linux/drivers/net/smc-ultra32.c linux/drivers/net/smc-ultra32.c
@@ -68,7 +68,7 @@
 static void ultra32_block_input(struct device *dev, int count,
 				struct sk_buff *skb, int ring_offset);
 static void ultra32_block_output(struct device *dev, int count,
-				 const unsigned char *buf, const start_page);
+				 const unsigned char *buf, const int start_page);
 static int ultra32_close(struct device *dev);
 
 #define ULTRA32_CMDREG	0	/* Offset to ASIC command register. */
@@ -238,9 +238,8 @@
 static int ultra32_open(struct device *dev)
 {
 	int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */
-	int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 : SA_SHIRQ;
 
-	if (request_irq(dev->irq, ei_interrupt, irq_flags, ei_status.name, dev))
+	if (request_irq(dev->irq, ei_interrupt, 0, ei_status.name, dev))
 		return -EAGAIN;
 
 	outb(ULTRA32_MEMENB, ioaddr); /* Enable Shared Memory. */
@@ -268,7 +267,7 @@
 
 	outb(0x00, ioaddr + ULTRA32_CFG6); /* Disable Interrupts. */
 	outb(0x00, ioaddr + 6);		/* Disable interrupts. */
-	free_irq(dev->irq, NULL);
+	free_irq(dev->irq, dev);
 	irq2dev_map[dev->irq] = 0;
 
 	NS8390_init(dev, 0);