Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187262
b: refs/heads/master
c: 66ed3f7
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Linus Torvalds committed Mar 12, 2010
1 parent 52df9e2 commit e0427d2
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: dcca7c3d003ce61ed71b412f645cfbe7bd8e882e
refs/heads/master: 66ed3f7516da31205aed9b47a13348c0d982c4f5
7 changes: 3 additions & 4 deletions trunk/drivers/edac/mpc85xx_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,16 +239,15 @@ static int __devinit mpc85xx_pci_err_probe(struct of_device *op,
/* we only need the error registers */
r.start += 0xe00;

if (!devm_request_mem_region(&op->dev, r.start,
r.end - r.start + 1, pdata->name)) {
if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r),
pdata->name)) {
printk(KERN_ERR "%s: Error while requesting mem region\n",
__func__);
res = -EBUSY;
goto err;
}

pdata->pci_vbase = devm_ioremap(&op->dev, r.start,
r.end - r.start + 1);
pdata->pci_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r));
if (!pdata->pci_vbase) {
printk(KERN_ERR "%s: Unable to setup PCI err regs\n", __func__);
res = -ENOMEM;
Expand Down

0 comments on commit e0427d2

Please sign in to comment.