Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 39214e512452..b7f45cd756a2 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -182,14 +182,14 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
         return -EBUSY;
     r2 = request_mem_region(mem_start, ARIADNE_RAM_SIZE, "RAM");
     if (!r2) {
-        release_resource(r1);
+        release_mem_region(base_addr, sizeof(struct Am79C960));
         return -EBUSY;
     }
 
     dev = alloc_etherdev(sizeof(struct ariadne_private));
     if (dev == NULL) {
-        release_resource(r1);
-        release_resource(r2);
+        release_mem_region(base_addr, sizeof(struct Am79C960));
+        release_mem_region(mem_start, ARIADNE_RAM_SIZE);
         return -ENOMEM;
     }
 
@@ -213,8 +213,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
 
     err = register_netdev(dev);
     if (err) {
-        release_resource(r1);
-        release_resource(r2);
+        release_mem_region(base_addr, sizeof(struct Am79C960));
+        release_mem_region(mem_start, ARIADNE_RAM_SIZE);
         free_netdev(dev);
         return err;
     }
@@ -425,11 +425,6 @@ static irqreturn_t ariadne_interrupt(int irq, void *data)
     int csr0, boguscnt;
     int handled = 0;
 
-    if (dev == NULL) {
-        printk(KERN_WARNING "ariadne_interrupt(): irq for unknown device.\n");
-        return IRQ_NONE;
-    }
-
     lance->RAP = CSR0;                  /* PCnet-ISA Controller Status */
 
     if (!(lance->RDP & INTR))           /* Check if any interrupt has been */