Commit 00f17e45 authored Dec 11, 2011 by Rob Clark Committed by Tomi Valkeinen Jan 02, 2012

OMAPDSS: fix potential NULL pointer ref in OCP_ERR handling path



The dispc's error handler tries to disable all outputs when OCP_ERR
happens. However, the code doesn't check if there actually is a display
on each particular output, nor if there's a driver for the display. This
may lead to NULL pointer reference.

Signed-off-by: Rob Clark <rob@ti.com>
[tomi.valkeinen@ti.com: added patch description]
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent f806f9b6

drivers/video/omap2/dss/dispc.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3201,6 +3201,7 @@ static void dispc_error_worker(struct work_struct *work)
	for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {		for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
	struct omap_overlay_manager *mgr;		struct omap_overlay_manager *mgr;
	mgr = omap_dss_get_overlay_manager(i);		mgr = omap_dss_get_overlay_manager(i);
			if (mgr->device && mgr->device->driver)
	mgr->device->driver->disable(mgr->device);		mgr->device->driver->disable(mgr->device);
	}		}
	}		}