Merge branch 'master' into for-next

[pandora-kernel.git] / drivers / usb / host / ehci-ath79.c

diff --git a/drivers/usb/host/ehci-ath79.c b/drivers/usb/host/ehci-ath79.c
index aa248c2..4d2e88d 100644 (file)
--- a/drivers/usb/host/ehci-ath79.c
+++ b/drivers/usb/host/ehci-ath79.c
@@ -148,7 +148,7 @@ static int ehci_ath79_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        hcd->rsrc_start = res->start;
-       hcd->rsrc_len   = res->end - res->start + 1;
+       hcd->rsrc_len   = resource_size(res);
 
        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                dev_dbg(&pdev->dev, "controller already in use\n");