diff options
author | Jassi Brar <jaswinder.singh@linaro.org> | 2012-07-24 10:03:55 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-08-10 08:48:28 -0400 |
commit | d7ad718d359789c8c9190547bbc0294aeba506e2 (patch) | |
tree | 1307bafbd132ede1eeeac11f68c6f4e0a57ea102 | |
parent | d3b4aa519c2c916c76ce7d83fa7288a6fd9ad9ac (diff) |
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>
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 4 |
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) | |||
3491 | ovl->name); | 3491 | ovl->name); |
3492 | dispc_ovl_enable(ovl->id, false); | 3492 | dispc_ovl_enable(ovl->id, false); |
3493 | dispc_mgr_go(ovl->manager->id); | 3493 | dispc_mgr_go(ovl->manager->id); |
3494 | mdelay(50); | 3494 | msleep(50); |
3495 | } | 3495 | } |
3496 | } | 3496 | } |
3497 | 3497 | ||
@@ -3523,7 +3523,7 @@ static void dispc_error_worker(struct work_struct *work) | |||
3523 | } | 3523 | } |
3524 | 3524 | ||
3525 | dispc_mgr_go(mgr->id); | 3525 | dispc_mgr_go(mgr->id); |
3526 | mdelay(50); | 3526 | msleep(50); |
3527 | 3527 | ||
3528 | if (enable) | 3528 | if (enable) |
3529 | dssdev->driver->enable(dssdev); | 3529 | dssdev->driver->enable(dssdev); |