diff options
| author | Julia Lawall <julia@diku.dk> | 2011-03-22 07:15:21 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-23 14:10:36 -0700 |
| commit | 88e87be6ba528bd73522ecf0468fe32f1ee199e6 (patch) | |
| tree | 067a74277788f507679184b9902c4dc127f0be72 /drivers/net/ariadne.c | |
| parent | 35d48903e9781975e823b359ee85c257c9ff5c1c (diff) | |
| download | linux-88e87be6ba528bd73522ecf0468fe32f1ee199e6.tar.gz linux-88e87be6ba528bd73522ecf0468fe32f1ee199e6.tar.bz2 linux-88e87be6ba528bd73522ecf0468fe32f1ee199e6.zip | |
drivers/net/ariadne.c: Convert release_resource to release_region/release_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>
Diffstat (limited to 'drivers/net/ariadne.c')
| -rw-r--r-- | drivers/net/ariadne.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index 7ca0eded2561..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; } |