aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/jazzsonic.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/jazzsonic.c')
-rw-r--r--drivers/net/jazzsonic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 6e5b3f30527f..f47d4d663b19 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -81,7 +81,7 @@ static unsigned short known_revisions[] =
81 81
82static int jazzsonic_open(struct net_device* dev) 82static int jazzsonic_open(struct net_device* dev)
83{ 83{
84 if (request_irq(dev->irq, &sonic_interrupt, IRQF_DISABLED, "sonic", dev)) { 84 if (request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
85 printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); 85 printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
86 return -EAGAIN; 86 return -EAGAIN;
87 } 87 }
@@ -130,8 +130,8 @@ static int __devinit sonic_probe1(struct net_device *dev)
130 printk("SONIC Silicon Revision = 0x%04x\n",silicon_revision); 130 printk("SONIC Silicon Revision = 0x%04x\n",silicon_revision);
131 131
132 i = 0; 132 i = 0;
133 while (known_revisions[i] != 0xffff 133 while (known_revisions[i] != 0xffff &&
134 && known_revisions[i] != silicon_revision) 134 known_revisions[i] != silicon_revision)
135 i++; 135 i++;
136 136
137 if (known_revisions[i] == 0xffff) { 137 if (known_revisions[i] == 0xffff) {