Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150797
b: refs/heads/master
c: 51611a1
h: refs/heads/master
i:
  150795: ef90fee
v: v3
  • Loading branch information
Wolfgang Grandegger authored and David S. Miller committed Jun 10, 2009
1 parent 2523dd6 commit 6642a16
Show file tree
Hide file tree
Showing 2 changed files with 7 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: bf12691d846b48fa6e3289810a822687457036cf
refs/heads/master: 51611a120e8120290152edd7d0020d22a7f4b4a3
10 changes: 6 additions & 4 deletions trunk/drivers/net/can/sja1000/sja1000_of_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,17 @@ static int __devinit sja1000_ofp_probe(struct of_device *ofdev,
res_size = resource_size(&res);

if (!request_mem_region(res.start, res_size, DRV_NAME)) {
dev_err(&ofdev->dev, "couldn't request %#x..%#x\n",
res.start, res.end);
dev_err(&ofdev->dev, "couldn't request %#llx..%#llx\n",
(unsigned long long)res.start,
(unsigned long long)res.end);
return -EBUSY;
}

base = ioremap_nocache(res.start, res_size);
if (!base) {
dev_err(&ofdev->dev, "couldn't ioremap %#x..%#x\n",
res.start, res.end);
dev_err(&ofdev->dev, "couldn't ioremap %#llx..%#llx\n",
(unsigned long long)res.start,
(unsigned long long)res.end);
err = -ENOMEM;
goto exit_release_mem;
}
Expand Down

0 comments on commit 6642a16

Please sign in to comment.