From 6033d919ca87e5c8d634473f67fb46bade4a640b Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 22 Mar 2011 07:15:23 +0000 Subject: [PATCH] --- yaml --- r: 242649 b: refs/heads/master c: e6937ee626dee9c66ae820f5cca11efca2933845 h: refs/heads/master i: 242647: 163bbcbac29980c18cd6de3c5159491945718c96 v: v3 --- [refs] | 2 +- trunk/drivers/net/a2065.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b9501d7e37ae..5d1e29484226 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88e87be6ba528bd73522ecf0468fe32f1ee199e6 +refs/heads/master: e6937ee626dee9c66ae820f5cca11efca2933845 diff --git a/trunk/drivers/net/a2065.c b/trunk/drivers/net/a2065.c index f142cc21e453..deaa8bc16cf8 100644 --- a/trunk/drivers/net/a2065.c +++ b/trunk/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; }