aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_fbdev.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2018-02-09 02:30:44 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2018-03-01 02:18:18 -0500
commite6204a58b9e9ad01ab9c6d4b8b2b8b9c4e38bbba (patch)
treee3cbd9eef09a592bcf3e25438d6f3edf61e19954 /drivers/gpu/drm/omapdrm/omap_fbdev.c
parentf9b34a0fa4e25d9c0b72f124680c37c0c38f9934 (diff)
drm/omap: fix omap_fbdev_free() when omap_fbdev_create() wasn't called
If we have no crtcs/connectors, fbdev init goes fine, but omap_fbdev_create() is never called. This means that omap_fbdev->bo is NULL and omap_fbdev_free() crashes. Add a check to omap_fbdev_free() to handle the NULL case. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fbdev.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_fbdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 1ace63e2ff22..632ebcf2165f 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -303,7 +303,8 @@ void omap_fbdev_free(struct drm_device *dev)
303 fbdev = to_omap_fbdev(priv->fbdev); 303 fbdev = to_omap_fbdev(priv->fbdev);
304 304
305 /* unpin the GEM object pinned in omap_fbdev_create() */ 305 /* unpin the GEM object pinned in omap_fbdev_create() */
306 omap_gem_unpin(fbdev->bo); 306 if (fbdev->bo)
307 omap_gem_unpin(fbdev->bo);
307 308
308 /* this will free the backing object */ 309 /* this will free the backing object */
309 if (fbdev->fb) 310 if (fbdev->fb)