Merge commit '7185684' into omap-for-v3.10/timer

[karo-tx-linux.git] / arch / arm / mach-tegra / tegra2_emc.c

diff --git a/arch/arm/mach-tegra/tegra2_emc.c b/arch/arm/mach-tegra/tegra2_emc.c
index 03e742f0a8ccb100b241a09af5a0343dcc937350..9e8bdfa2b36915e4db7a8352753626e7f41b682e 100644 (file)
--- a/arch/arm/mach-tegra/tegra2_emc.c
+++ b/arch/arm/mach-tegra/tegra2_emc.c
@@ -312,11 +312,9 @@ static int tegra_emc_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       emc_regbase = devm_request_and_ioremap(&pdev->dev, res);
-       if (!emc_regbase) {
-               dev_err(&pdev->dev, "failed to remap registers\n");
-               return -ENOMEM;
-       }
+       emc_regbase = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(emc_regbase))
+               return PTR_ERR(emc_regbase);
 
        pdata = pdev->dev.platform_data;