ACPICA: add preemption point after each opcode parse

[linux-2.6-omap-h63xx.git] / drivers / net / au1000_eth.c

diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 3634b5fd791964d88bf42bd3785402b79e0fc44a..5ee1b0557a028f1bf7c6e621c50a60d0a6c14e9f 100644 (file)
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -807,7 +807,7 @@ err_out:
 static int au1000_init(struct net_device *dev)
 {
        struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       u32 flags;
+       unsigned long flags;
        int i;
        u32 control;
 
@@ -911,9 +911,8 @@ au1000_adjust_link(struct net_device *dev)
        if(phydev->link != aup->old_link) {
                // link state changed
 
-               if (phydev->link) // link went up
-                       netif_schedule(dev);
-               else { // link went down
+               if (!phydev->link) {
+                       /* link went down */
                        aup->old_speed = 0;
                        aup->old_duplex = -1;
                }
@@ -1239,12 +1238,7 @@ static int au1000_rx(struct net_device *dev)
  */
 static irqreturn_t au1000_interrupt(int irq, void *dev_id)
 {
-       struct net_device *dev = (struct net_device *) dev_id;
-
-       if (dev == NULL) {
-               printk(KERN_ERR "%s: isr: null dev ptr\n", dev->name);
-               return IRQ_RETVAL(1);
-       }
+       struct net_device *dev = dev_id;
 
        /* Handle RX interrupts first to minimize chance of overrun */