mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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>
This commit is contained in:
parent
35d48903e9
commit
88e87be6ba
1 changed files with 5 additions and 5 deletions
|
@ -182,14 +182,14 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
r2 = request_mem_region(mem_start, ARIADNE_RAM_SIZE, "RAM");
|
r2 = request_mem_region(mem_start, ARIADNE_RAM_SIZE, "RAM");
|
||||||
if (!r2) {
|
if (!r2) {
|
||||||
release_resource(r1);
|
release_mem_region(base_addr, sizeof(struct Am79C960));
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev = alloc_etherdev(sizeof(struct ariadne_private));
|
dev = alloc_etherdev(sizeof(struct ariadne_private));
|
||||||
if (dev == NULL) {
|
if (dev == NULL) {
|
||||||
release_resource(r1);
|
release_mem_region(base_addr, sizeof(struct Am79C960));
|
||||||
release_resource(r2);
|
release_mem_region(mem_start, ARIADNE_RAM_SIZE);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -213,8 +213,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
|
||||||
|
|
||||||
err = register_netdev(dev);
|
err = register_netdev(dev);
|
||||||
if (err) {
|
if (err) {
|
||||||
release_resource(r1);
|
release_mem_region(base_addr, sizeof(struct Am79C960));
|
||||||
release_resource(r2);
|
release_mem_region(mem_start, ARIADNE_RAM_SIZE);
|
||||||
free_netdev(dev);
|
free_netdev(dev);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue