Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / drivers / net / jazzsonic.c

diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 6e5b3f3..f47d4d6 100644 (file)
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -81,7 +81,7 @@ static unsigned short known_revisions[] =
 
 static int jazzsonic_open(struct net_device* dev)
 {
-       if (request_irq(dev->irq, &sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
+       if (request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
                return -EAGAIN;
        }
@@ -130,8 +130,8 @@ static int __devinit sonic_probe1(struct net_device *dev)
                printk("SONIC Silicon Revision = 0x%04x\n",silicon_revision);
 
        i = 0;
-       while (known_revisions[i] != 0xffff
-              && known_revisions[i] != silicon_revision)
+       while (known_revisions[i] != 0xffff &&
+              known_revisions[i] != silicon_revision)
                i++;
 
        if (known_revisions[i] == 0xffff) {