From: Archit Taneja Date: Tue, 8 May 2012 12:49:15 +0000 (+0530) Subject: OMAPDSS: APPLY: Don't check manager settings if it is disabled X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5dd747e8892a63a5d4cc1d2765c0f533a5d74cfd;p=linux-beck.git OMAPDSS: APPLY: Don't check manager settings if it is disabled If a manager is disabled, there is no guarantee at any point in time that all it's parameters are configured. There is always a chance that some more parameters are yet to be configured by a user of DSS, or by DSS itself. However, when the manager is enabled, we can be certain that all the parameters have been configured, as we can't enable a manager with an incomplete configuration. Therefore, if a manager is disabled, don't check for the validity of it's parameters or the parameters of the overlays connected to it. Only check once it is enabled. Add a check in dss_check_settings_low() to achieve the same. Signed-off-by: Archit Taneja --- diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 57686f66411c..ad349b3083c1 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -192,6 +192,9 @@ static int dss_check_settings_low(struct omap_overlay_manager *mgr, mp = get_mgr_priv(mgr); + if (!mp->enabled) + return 0; + if (applying && mp->user_info_dirty) mi = &mp->user_info; else