Skip to content

Commit

Permalink
drivers/net/ariadne.c: Convert release_resource to release_region/rel…
Browse files Browse the repository at this point in the history
…ease_mem_region

Request_mem_region should be used with release_mem_region, not
release_resource.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,E;
@@
*x = request_mem_region(...)
... when != release_mem_region(x)
    when != x = E
* release_resource(x);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Julia Lawall authored and David S. Miller committed Mar 23, 2011
1 parent 35d4890 commit 88e87be
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/ariadne.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}
Expand Down

0 comments on commit 88e87be

Please sign in to comment.