There's no need to register the vsync ISR and configure the hardware if the overlay manager is disabled, so this patch adds a check for disabled managers to the omap_dss_mgr_apply() function. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx> --- drivers/video/omap2/dss/apply.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 04f3ff5..cf68c9e 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -629,7 +629,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) } r = 0; - if (!mgr_manual_update(mgr)) { + if (mgr->enabled && !mgr_manual_update(mgr)) { if (!dss_cache.irq_enabled) { u32 mask; -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html