Message ID | 1343138635-2802-1-git-send-email-jaswinder.singh@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, 2012-07-24 at 19:33 +0530, Jassi Brar wrote: > We have no reason to block in the error handler workqueue, so use msleep. > > Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org> > --- > drivers/video/omap2/dss/dispc.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Thanks, applied. As a side note, I hate that error handler =). It was a quick emergency hack to somehow handle certain situations, but generally it sucks. However, I don't really have a good idea what to do in case we get errors from DSS HW. Tomi
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index c56a51a..0e3ad44 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -3492,7 +3492,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); } } @@ -3524,7 +3524,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);
We have no reason to block in the error handler workqueue, so use msleep. Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org> --- drivers/video/omap2/dss/dispc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)