Fix sparse warning:

drivers/gpu/drm/omapdrm/dss/dispc.c:387:9: warning: context imbalance in 
'mgr_fld_write' - different lock contexts for basic block

Signed-off-by: Tomi Valkeinen <tomi.valkei...@ti.com>
---
 drivers/gpu/drm/omapdrm/dss/dispc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c 
b/drivers/gpu/drm/omapdrm/dss/dispc.c
index 86d18f2d48ba..679931e108f9 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -384,13 +384,13 @@ static void mgr_fld_write(enum omap_channel channel,
        const bool need_lock = rfld.reg == DISPC_CONTROL || rfld.reg == 
DISPC_CONFIG;
        unsigned long flags;
 
-       if (need_lock)
+       if (need_lock) {
                spin_lock_irqsave(&dispc.control_lock, flags);
-
-       REG_FLD_MOD(rfld.reg, val, rfld.high, rfld.low);
-
-       if (need_lock)
+               REG_FLD_MOD(rfld.reg, val, rfld.high, rfld.low);
                spin_unlock_irqrestore(&dispc.control_lock, flags);
+       } else {
+               REG_FLD_MOD(rfld.reg, val, rfld.high, rfld.low);
+       }
 }
 
 static int dispc_get_num_ovls(void)
-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to