Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 173824
b: refs/heads/master
c: 4b7c723
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and David S. Miller committed Nov 23, 2009
1 parent 1b9ddb2 commit 16dc90b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a531cd69ada8c8b89f631b1b6ba246b5d84b5344
refs/heads/master: 4b7c7237c0826417059d2e60ffe6ed43202dc087
7 changes: 3 additions & 4 deletions trunk/drivers/ide/au1xxx-ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -532,14 +532,13 @@ static int au_ide_probe(struct platform_device *dev)
goto out;
}

if (!request_mem_region(res->start, res->end - res->start + 1,
dev->name)) {
if (!request_mem_region(res->start, resource_size(res), dev->name)) {
pr_debug("%s: request_mem_region failed\n", DRV_NAME);
ret = -EBUSY;
goto out;
}

ahwif->regbase = (u32)ioremap(res->start, res->end - res->start + 1);
ahwif->regbase = (u32)ioremap(res->start, resource_size(res));
if (ahwif->regbase == 0) {
ret = -ENOMEM;
goto out;
Expand Down Expand Up @@ -575,7 +574,7 @@ static int au_ide_remove(struct platform_device *dev)
iounmap((void *)ahwif->regbase);

res = platform_get_resource(dev, IORESOURCE_MEM, 0);
release_mem_region(res->start, res->end - res->start + 1);
release_mem_region(res->start, resource_size(res));

return 0;
}
Expand Down

0 comments on commit 16dc90b

Please sign in to comment.