From 00f17e4560da32db454c46faf1e8df4fe35cc226 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 11 Dec 2011 14:02:27 -0600 Subject: 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 [tomi.valkeinen@ti.com: added patch description] Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dispc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/video/omap2/dss/dispc.c') diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 0f84034..4d68428 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -3201,7 +3201,8 @@ static void dispc_error_worker(struct work_struct *work) for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) { struct omap_overlay_manager *mgr; mgr = omap_dss_get_overlay_manager(i); - mgr->device->driver->disable(mgr->device); + if (mgr->device && mgr->device->driver) + mgr->device->driver->disable(mgr->device); } } -- cgit v1.1