summaryrefslogtreecommitdiff
path: root/drivers/video/omap2/dss/apply.c
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2011-12-17 13:28:52 -0600
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-01-02 08:51:28 +0200
commit1f3f53ae5179ba7f24b4a429bc41773f1f4857ca (patch)
treeade70e034a61a37b9f9db68f31d3783be3883221 /drivers/video/omap2/dss/apply.c
parent6ea9b31792745ee620509930dc9eead6e1c4be25 (diff)
OMAPDSS: APPLY: fix NULL pointer deref when mgr is not set
extra_info_update_ongoing() goes through all overlays, but doesn't check if the overlay is connected to a manager. This leads to a crash whenever an overlay has been detached. Add a check to skip the non-connected overlays. Reported-by: Rob Clark <rob@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/apply.c')
-rw-r--r--drivers/video/omap2/dss/apply.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 0a6fb8de19c0..052dc874cd3d 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -327,6 +327,9 @@ static bool extra_info_update_ongoing(void)
ovl = omap_dss_get_overlay(i);
op = get_ovl_priv(ovl);
+ if (!ovl->manager)
+ continue;
+
mp = get_mgr_priv(ovl->manager);
if (!mp->enabled)