Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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

diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index f142cc2..deaa8bc 100644 (file)
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -711,14 +711,14 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
                return -EBUSY;
        r2 = request_mem_region(mem_start, A2065_RAM_SIZE, "RAM");
        if (!r2) {
-               release_resource(r1);
+               release_mem_region(base_addr, sizeof(struct lance_regs));
                return -EBUSY;
        }
 
        dev = alloc_etherdev(sizeof(struct lance_private));
        if (dev == NULL) {
-               release_resource(r1);
-               release_resource(r2);
+               release_mem_region(base_addr, sizeof(struct lance_regs));
+               release_mem_region(mem_start, A2065_RAM_SIZE);
                return -ENOMEM;
        }
 
@@ -764,8 +764,8 @@ static int __devinit a2065_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 lance_regs));
+               release_mem_region(mem_start, A2065_RAM_SIZE);
                free_netdev(dev);
                return err;
        }