summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJassi Brar <jaswinder.singh@linaro.org>2012-07-24 19:33:55 +0530
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-08-10 15:48:28 +0300
commitd7ad718d359789c8c9190547bbc0294aeba506e2 (patch)
tree1307bafbd132ede1eeeac11f68c6f4e0a57ea102 /drivers/video
parentd3b4aa519c2c916c76ce7d83fa7288a6fd9ad9ac (diff)
downloadblackbird-op-linux-d7ad718d359789c8c9190547bbc0294aeba506e2.tar.gz
blackbird-op-linux-d7ad718d359789c8c9190547bbc0294aeba506e2.zip
OMAPDSS: DISPC: Use msleep instead of blocking mdelay
We have no reason to block in the error handler workqueue, so use msleep. Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/dispc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 5b289c5f695b..ff52702dfd2f 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -3491,7 +3491,7 @@ static void dispc_error_worker(struct work_struct *work)
ovl->name);
dispc_ovl_enable(ovl->id, false);
dispc_mgr_go(ovl->manager->id);
- mdelay(50);
+ msleep(50);
}
}
@@ -3523,7 +3523,7 @@ static void dispc_error_worker(struct work_struct *work)
}
dispc_mgr_go(mgr->id);
- mdelay(50);
+ msleep(50);
if (enable)
dssdev->driver->enable(dssdev);
OpenPOWER on IntegriCloud