From patchwork Tue May 18 12:35:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 100453 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4ICa8j2000599 for ; Tue, 18 May 2010 12:36:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757499Ab0ERMgH (ORCPT ); Tue, 18 May 2010 08:36:07 -0400 Received: from smtp.nokia.com ([192.100.122.233]:57904 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757495Ab0ERMgF (ORCPT ); Tue, 18 May 2010 08:36:05 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4ICa1mI020894; Tue, 18 May 2010 15:36:02 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 18 May 2010 15:36:00 +0300 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Tue, 18 May 2010 15:35:59 +0300 Received: from localhost.localdomain (esdhcp041221.research.nokia.com [172.21.41.221]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4ICZbxK017740; Tue, 18 May 2010 15:35:55 +0300 From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org Cc: Jani Nikula , Tomi Valkeinen Subject: [PATCH 09/23] OMAP: DSS2: Fix device disable when driver is not loaded Date: Tue, 18 May 2010 15:35:00 +0300 Message-Id: <1274186114-26951-10-git-send-email-tomi.valkeinen@nokia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1274186114-26951-1-git-send-email-tomi.valkeinen@nokia.com> References: <1274186114-26951-1-git-send-email-tomi.valkeinen@nokia.com> X-OriginalArrivalTime: 18 May 2010 12:36:00.0107 (UTC) FILETIME=[ABC0CBB0:01CAF686] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 18 May 2010 12:36:08 +0000 (UTC) diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c index 7138963..ef8c852 100644 --- a/drivers/video/omap2/dss/display.c +++ b/drivers/video/omap2/dss/display.c @@ -545,7 +545,10 @@ int dss_resume_all_devices(void) static int dss_disable_device(struct device *dev, void *data) { struct omap_dss_device *dssdev = to_dss_device(dev); - dssdev->driver->disable(dssdev); + + if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) + dssdev->driver->disable(dssdev); + return 0; }