From patchwork Mon Jun 7 07:47:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 104651 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 o577mgMP000961 for ; Mon, 7 Jun 2010 07:48:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756367Ab0FGHsR (ORCPT ); Mon, 7 Jun 2010 03:48:17 -0400 Received: from smtp.nokia.com ([192.100.122.230]:61960 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756347Ab0FGHsQ (ORCPT ); Mon, 7 Jun 2010 03:48:16 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o577lfFW018823; Mon, 7 Jun 2010 10:48:07 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 7 Jun 2010 10:47:41 +0300 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Mon, 7 Jun 2010 10:47:40 +0300 Received: from [172.21.51.35] (esdhcp05135.research.nokia.com [172.21.51.35]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o577lZaO009150; Mon, 7 Jun 2010 10:47:36 +0300 Subject: Re: OMAP video compile error; regression from 2.6.33-rc4 onward (including current master) From: Tomi Valkeinen To: ext Luke-Jr Cc: "slapin@ossfans.org" , "linux-kernel@vger.kernel.org" , "linux-omap@vger.kernel.org" In-Reply-To: <201006061652.39248.luke@dashjr.org> References: <201006061652.39248.luke@dashjr.org> Date: Mon, 07 Jun 2010 10:47:34 +0300 Message-ID: <1275896854.2549.14.camel@tubuntu.research.nokia.com> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-OriginalArrivalTime: 07 Jun 2010 07:47:40.0660 (UTC) FILETIME=[B4BDAB40:01CB0615] 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]); Mon, 07 Jun 2010 07:48:42 +0000 (UTC) diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index 1162603..eada9f1 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "omapfb.h" #include "dispc.h" @@ -83,13 +84,13 @@ static inline u32 rfbi_read_reg(int idx) static int rfbi_get_clocks(void) { - rfbi.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick"); + rfbi.dss_ick = clk_get(&rfbi.fbdev->dssdev->dev, "ick"); if (IS_ERR(rfbi.dss_ick)) { dev_err(rfbi.fbdev->dev, "can't get ick\n"); return PTR_ERR(rfbi.dss_ick); } - rfbi.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck"); + rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck"); if (IS_ERR(rfbi.dss1_fck)) { dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); clk_put(rfbi.dss_ick);