Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[cascardo/linux.git] / drivers / rtc / rtc-spear.c

diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index c2121b5..a18c319 100644 (file)
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -385,11 +385,9 @@ static int spear_rtc_probe(struct platform_device *pdev)
                return status;
        }
 
-       config->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
-       if (!config->ioaddr) {
-               dev_err(&pdev->dev, "request-ioremap fail\n");
-               return -ENOMEM;
-       }
+       config->ioaddr = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(config->ioaddr))
+               return PTR_ERR(config->ioaddr);
 
        config->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(config->clk))