From: Jassi Brar Date: Tue, 24 Jul 2012 14:03:55 +0000 (+0530) Subject: OMAPDSS: DISPC: Use msleep instead of blocking mdelay X-Git-Tag: v3.7-rc1~48^2~1^2~23 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d7ad718d359789c8c9190547bbc0294aeba506e2;p=~emulex%2Finfiniband.git 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 Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 5b289c5f695..ff52702dfd2 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);