Merge tag 'drm-misc-next-2017-01-23' of git://anongit.freedesktop.org/git/drm-misc...

[karo-tx-linux.git] / drivers / gpu / drm / sti / sti_vtg.c

diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c
index a8882bdd0f8badf46d0921710dc359cee2f88cde..c3d9c8ae14afeb66b998a59a37b1bdbb60bb87d8 100644 (file)
--- a/drivers/gpu/drm/sti/sti_vtg.c
+++ b/drivers/gpu/drm/sti/sti_vtg.c
@@ -429,6 +429,10 @@ static int vtg_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
        vtg->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
+       if (!vtg->regs) {
+               DRM_ERROR("failed to remap I/O memory\n");
+               return -ENOMEM;
+       }
 
        np = of_parse_phandle(pdev->dev.of_node, "st,slave", 0);
        if (np) {