Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185247
b: refs/heads/master
c: 5672b7e
h: refs/heads/master
i:
  185245: 12f1fe4
  185243: 243d51d
  185239: f34f382
  185231: 8e0237a
  185215: 557348b
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 2, 2010
1 parent 2b9f45b commit 04dee41
Show file tree
Hide file tree
Showing 2 changed files with 5 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: d8bb0fd26b555f505019b9b68b6d581fb9f80348
refs/heads/master: 5672b7e6a99a91838c1b595a80d43006bcd9a178
8 changes: 4 additions & 4 deletions trunk/drivers/usb/host/ehci-orion.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,14 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
goto err1;
}

if (!request_mem_region(res->start, res->end - res->start + 1,
if (!request_mem_region(res->start, resource_size(res),
ehci_orion_hc_driver.description)) {
dev_dbg(&pdev->dev, "controller already in use\n");
err = -EBUSY;
goto err1;
}

regs = ioremap(res->start, res->end - res->start + 1);
regs = ioremap(res->start, resource_size(res));
if (regs == NULL) {
dev_dbg(&pdev->dev, "error mapping memory\n");
err = -EFAULT;
Expand All @@ -244,7 +244,7 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
}

hcd->rsrc_start = res->start;
hcd->rsrc_len = res->end - res->start + 1;
hcd->rsrc_len = resource_size(res);
hcd->regs = regs;

ehci = hcd_to_ehci(hcd);
Expand Down Expand Up @@ -287,7 +287,7 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
err3:
iounmap(regs);
err2:
release_mem_region(res->start, res->end - res->start + 1);
release_mem_region(res->start, resource_size(res));
err1:
dev_err(&pdev->dev, "init %s fail, %d\n",
dev_name(&pdev->dev), err);
Expand Down

0 comments on commit 04dee41

Please sign in to comment.