Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...

[~andy/linux] / drivers / rtc / rtc-ds1742.c

diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 042630c90dd34e7c8232a3ddde5b14809bf0176e..d84a448dd754b32203ace25e336df50e5710f43f 100644 (file)
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -173,7 +173,7 @@ static int __devinit ds1742_rtc_probe(struct platform_device *pdev)
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
                return -ENOMEM;
-       pdata->size = res->end - res->start + 1;
+       pdata->size = resource_size(res);
        if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
                pdev->name))
                return -EBUSY;