Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / gpu / drm / tegra / hdmi.c

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 92ad276..d4f3fb9 100644 (file)
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1258,9 +1258,9 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
        if (!regs)
                return -ENXIO;
 
-       hdmi->regs = devm_request_and_ioremap(&pdev->dev, regs);
-       if (!hdmi->regs)
-               return -EADDRNOTAVAIL;
+       hdmi->regs = devm_ioremap_resource(&pdev->dev, regs);
+       if (IS_ERR(hdmi->regs))
+               return PTR_ERR(hdmi->regs);
 
        err = platform_get_irq(pdev, 0);
        if (err < 0)