aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/isa-skeleton.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/isa-skeleton.c')
-rw-r--r--drivers/net/isa-skeleton.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 9706e64e367b..04d0502726c0 100644
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -214,9 +214,9 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
214 * contains the manufacturer's unique code. That might be a good probe 214 * contains the manufacturer's unique code. That might be a good probe
215 * method. Ideally you would add additional checks. 215 * method. Ideally you would add additional checks.
216 */ 216 */
217 if (inb(ioaddr + 0) != SA_ADDR0 217 if (inb(ioaddr + 0) != SA_ADDR0 ||
218 || inb(ioaddr + 1) != SA_ADDR1 218 inb(ioaddr + 1) != SA_ADDR1 ||
219 || inb(ioaddr + 2) != SA_ADDR2) 219 inb(ioaddr + 2) != SA_ADDR2)
220 goto out; 220 goto out;
221 221
222 if (net_debug && version_printed++ == 0) 222 if (net_debug && version_printed++ == 0)
@@ -260,7 +260,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
260 dev->irq = 9; 260 dev->irq = 9;
261 261
262 { 262 {
263 int irqval = request_irq(dev->irq, &net_interrupt, 0, cardname, dev); 263 int irqval = request_irq(dev->irq, net_interrupt, 0, cardname, dev);
264 if (irqval) { 264 if (irqval) {
265 printk("%s: unable to get IRQ %d (irqval=%d).\n", 265 printk("%s: unable to get IRQ %d (irqval=%d).\n",
266 dev->name, dev->irq, irqval); 266 dev->name, dev->irq, irqval);
@@ -378,7 +378,7 @@ net_open(struct net_device *dev)
378 * This is used if the interrupt line can turned off (shared). 378 * This is used if the interrupt line can turned off (shared).
379 * See 3c503.c for an example of selecting the IRQ at config-time. 379 * See 3c503.c for an example of selecting the IRQ at config-time.
380 */ 380 */
381 if (request_irq(dev->irq, &net_interrupt, 0, cardname, dev)) { 381 if (request_irq(dev->irq, net_interrupt, 0, cardname, dev)) {
382 return -EAGAIN; 382 return -EAGAIN;
383 } 383 }
384 /* 384 /*