From 04dee41ffb8ef639f366aca8e40c3176ac4239ac Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 14 Dec 2009 18:13:00 -0500 Subject: [PATCH] --- yaml --- r: 185247 b: refs/heads/master c: 5672b7e6a99a91838c1b595a80d43006bcd9a178 h: refs/heads/master i: 185245: 12f1fe4ceade893fbc87aa372a3d22aeeb9d0946 185243: 243d51dc080828a5471603a90ee84a4d52f91033 185239: f34f382e410e94bc0cf9d10d33b2ac9d62a15118 185231: 8e0237a70871d98ba20d0f96cc415c821435a0c4 185215: 557348b1f539a0423fc632a761ad635c6f271775 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-orion.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3d945568904d..8908c427ddbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8bb0fd26b555f505019b9b68b6d581fb9f80348 +refs/heads/master: 5672b7e6a99a91838c1b595a80d43006bcd9a178 diff --git a/trunk/drivers/usb/host/ehci-orion.c b/trunk/drivers/usb/host/ehci-orion.c index 1d283e1b2b8d..0f87dc72820a 100644 --- a/trunk/drivers/usb/host/ehci-orion.c +++ b/trunk/drivers/usb/host/ehci-orion.c @@ -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; @@ -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); @@ -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);