Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / rtc / rtc-tegra.c

diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index c84ea6659f497fb32d67a8ec02f70e38a57055ce..7c033756d6b53509578a67486ac2be09f473ffe2 100644 (file)
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -327,11 +327,9 @@ static int tegra_rtc_probe(struct platform_device *pdev)
                return -EBUSY;
        }
 
-       info->rtc_base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!info->rtc_base) {
-               dev_err(&pdev->dev, "Unable to request mem region and grab IOs for device.\n");
-               return -EBUSY;
-       }
+       info->rtc_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(info->rtc_base))
+               return PTR_ERR(info->rtc_base);
 
        info->tegra_rtc_irq = platform_get_irq(pdev, 0);
        if (info->tegra_rtc_irq <= 0)