Merge tag 'v3.12-rc2' into drm-intel-next

[~andy/linux] / drivers / memory / tegra30-mc.c

diff --git a/drivers/memory/tegra30-mc.c b/drivers/memory/tegra30-mc.c
index 58d2979b4035653543aaf6f2ec5d80cb01662991..ef7934535fd1cb2d52cadc3c19fdc48e507a4157 100644 (file)
--- a/drivers/memory/tegra30-mc.c
+++ b/drivers/memory/tegra30-mc.c
@@ -340,8 +340,6 @@ static int tegra30_mc_probe(struct platform_device *pdev)
                struct resource *res;
 
                res = platform_get_resource(pdev, IORESOURCE_MEM, i);
-               if (!res)
-                       return -ENODEV;
                mc->regs[i] = devm_ioremap_resource(&pdev->dev, res);
                if (IS_ERR(mc->regs[i]))
                        return PTR_ERR(mc->regs[i]);