aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mac89x0.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/mac89x0.c')
-rw-r--r--drivers/net/mac89x0.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 149e0ed4a055..23b633e2ac42 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -222,8 +222,8 @@ struct net_device * __init mac89x0_probe(int unit)
222 int card_present; 222 int card_present;
223 223
224 local_irq_save(flags); 224 local_irq_save(flags);
225 card_present = hwreg_present((void*) ioaddr+4) 225 card_present = (hwreg_present((void*) ioaddr+4) &&
226 && hwreg_present((void*) ioaddr + DATA_PORT); 226 hwreg_present((void*) ioaddr + DATA_PORT));
227 local_irq_restore(flags); 227 local_irq_restore(flags);
228 228
229 if (!card_present) 229 if (!card_present)
@@ -337,7 +337,7 @@ net_open(struct net_device *dev)
337 writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL) & ~ENABLE_IRQ); 337 writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL) & ~ENABLE_IRQ);
338 338
339 /* Grab the interrupt */ 339 /* Grab the interrupt */
340 if (request_irq(dev->irq, &net_interrupt, 0, "cs89x0", dev)) 340 if (request_irq(dev->irq, net_interrupt, 0, "cs89x0", dev))
341 return -EAGAIN; 341 return -EAGAIN;
342 342
343 /* Set up the IRQ - Apparently magic */ 343 /* Set up the IRQ - Apparently magic */