From patchwork Thu Mar 31 10:11:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 678961 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2VABfQV027473 for ; Thu, 31 Mar 2011 10:11:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933884Ab1CaKLj (ORCPT ); Thu, 31 Mar 2011 06:11:39 -0400 Received: from na3sys009aog116.obsmtp.com ([74.125.149.240]:42412 "EHLO na3sys009aog116.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933501Ab1CaKLi (ORCPT ); Thu, 31 Mar 2011 06:11:38 -0400 Received: from source ([74.125.82.44]) (using TLSv1) by na3sys009aob116.postini.com ([74.125.148.12]) with SMTP ID DSNKTZRTWMmWHCEM2gOUTV0sGJBT3RXYErGK@postini.com; Thu, 31 Mar 2011 03:11:38 PDT Received: by wwa36 with SMTP id 36so1824454wwa.13 for ; Thu, 31 Mar 2011 03:11:35 -0700 (PDT) Received: by 10.216.232.8 with SMTP id m8mr2450953weq.22.1301566295668; Thu, 31 Mar 2011 03:11:35 -0700 (PDT) Received: from deskari (a62-248-146-119.elisa-laajakaista.fi [62.248.146.119]) by mx.google.com with ESMTPS id d6sm429627wer.26.2011.03.31.03.11.34 (version=SSLv3 cipher=OTHER); Thu, 31 Mar 2011 03:11:34 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Tomi Valkeinen Subject: [PATCH 9/9] OMAP: DSS2: VENC: Add missing start/stop_device calls Date: Thu, 31 Mar 2011 13:11:06 +0300 Message-Id: <1301566266-11187-10-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1301566266-11187-1-git-send-email-tomi.valkeinen@ti.com> References: <1301566266-11187-1-git-send-email-tomi.valkeinen@ti.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 31 Mar 2011 10:11:41 +0000 (UTC) diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index fe18800..b845c56 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -476,6 +476,12 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) mutex_lock(&venc.venc_lock); + r = omap_dss_start_device(dssdev); + if (r) { + DSSERR("failed to start device\n"); + goto err0; + } + if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) { r = -EINVAL; goto err1; @@ -487,7 +493,11 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) dssdev->state = OMAP_DSS_DISPLAY_ACTIVE; + mutex_unlock(&venc.venc_lock); + return 0; err1: + omap_dss_stop_device(dssdev); +err0: mutex_unlock(&venc.venc_lock); return r; @@ -511,6 +521,8 @@ static void venc_panel_disable(struct omap_dss_device *dssdev) venc_power_off(dssdev); dssdev->state = OMAP_DSS_DISPLAY_DISABLED; + + omap_dss_stop_device(dssdev); end: mutex_unlock(&venc.venc_lock); }