summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-10-16 13:19:37 +0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-10-22 12:07:08 +0400
commit13a0c40a49380752d8fbe1ff27009df2b5c71fcf (patch)
tree8cf58b22aa68c68648c933de50d75c003fdc3083 /drivers/video
parent63cec5a22c13a80d80cb38acdb5b555eafb74ddc (diff)
downloadlinux-13a0c40a49380752d8fbe1ff27009df2b5c71fcf.tar.xz
OMAPFB: fix releasing overlays
omapfb disables all the overlays when freeing resources, but it should also remove those overlays from overlay managers. Not doing so causes a crash if omapfb is unbound and bound, or omapfb module is removed and loaded, while keeping omapdss around. Fix this by calling unset_manager() for all overlays. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/omap2/omapfb/omapfb-main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index a04096a63cb1..ce8a70570756 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -1837,6 +1837,9 @@ static void omapfb_free_resources(struct omapfb2_device *fbdev)
struct omap_overlay *ovl = fbdev->overlays[i];
ovl->disable(ovl);
+
+ if (ovl->manager)
+ ovl->unset_manager(ovl);
}
for (i = 0; i < fbdev->num_fbs; i++)