From: Tomi Valkeinen Date: Fri, 25 Nov 2011 15:22:53 +0000 (+0200) Subject: OMAPDSS: APPLY: fix extra_info_update_ongoing X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cc372d84e231ea9f574ef5de9a7ab39dee5a021d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git OMAPDSS: APPLY: fix extra_info_update_ongoing extra_info_update_ongoing() skipped checks for overlays that were marked as disabled. This doesn't work, as the enable status of an overlay is in the extra_info group, and thus extra_info_update_ongoing() reports false when we are disabling an overlay. This causes wait_pending_extra_info_updates() to not wait for the ongoing overlay disable. This patch changes extra_info_update_ongoing() to check the state of overlays marked as disabled. Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 614592c7a75c..5d205ada30de 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -410,9 +410,6 @@ static bool extra_info_update_ongoing(void) ovl = omap_dss_get_overlay(i); op = get_ovl_priv(ovl); - if (!op->enabled) - continue; - mp = get_mgr_priv(ovl->manager); if (!mp->enabled)