From e275723f264810a612c005277dd209924b3d8415 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 16 Nov 2011 16:53:44 +0200 Subject: [PATCH] --- yaml --- r: 284954 b: refs/heads/master c: e70f98acaa84ec9ad55e544d0dc8b2d0a36bbeca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/apply.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 113a9b855142..4de95666a9a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1577ce18004337ec2f6f48109ca14cac10a0a4f +refs/heads/master: e70f98acaa84ec9ad55e544d0dc8b2d0a36bbeca diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index 443f31e74a75..4cc7c37acbb4 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -688,16 +688,11 @@ static void omap_dss_mgr_apply_mgr(struct omap_overlay_manager *mgr) int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) { - int r; unsigned long flags; struct omap_overlay *ovl; DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name); - r = dispc_runtime_get(); - if (r) - return r; - spin_lock_irqsave(&data_lock, flags); /* Configure overlays */ @@ -711,9 +706,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) spin_unlock_irqrestore(&data_lock, flags); - dispc_runtime_put(); - - return r; + return 0; } static void dss_apply_ovl_enable(struct omap_overlay *ovl, bool enable)