summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dispc.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-24 09:20:40 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-29 12:44:43 +0200
commit4c6c65b013a20054585dfca5cfbf3a2f6393ab50 (patch)
tree2416dcb9bcf12d43540d438a4f3b6467d2ee3e70 /drivers/video/omap2/dss/dispc.c
parent901e5fe5a47d360a8ad6b5fbbe37e107ddb11662 (diff)
downloadop-kernel-dev-4c6c65b013a20054585dfca5cfbf3a2f6393ab50.zip
op-kernel-dev-4c6c65b013a20054585dfca5cfbf3a2f6393ab50.tar.gz
OMAPDSS: DISPC: fix loop in error handler
The dispc's error handler has a loop inside another loop, and both use the same loop variable. This is clearly wrong, and this patch makes a new variable for the inner loop. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dispc.c')
-rw-r--r--drivers/video/omap2/dss/dispc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index d294873..070ce30 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -3901,6 +3901,7 @@ static void dispc_error_worker(struct work_struct *work)
bit = mgr_desc[i].sync_lost_irq;
if (bit & errors) {
+ int j;
struct omap_dss_device *dssdev = mgr->get_device(mgr);
bool enable;
@@ -3911,9 +3912,9 @@ static void dispc_error_worker(struct work_struct *work)
enable = dssdev->state == OMAP_DSS_DISPLAY_ACTIVE;
dssdev->driver->disable(dssdev);
- for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+ for (j = 0; j < omap_dss_get_num_overlays(); ++j) {
struct omap_overlay *ovl;
- ovl = omap_dss_get_overlay(i);
+ ovl = omap_dss_get_overlay(j);
if (ovl->id != OMAP_DSS_GFX &&
ovl->manager == mgr)
OpenPOWER on IntegriCloud