From patchwork Tue Jan 11 12:43:43 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jamie Iles <jamie@jamieiles.com>
X-Patchwork-Id: 471281
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 p0BCjZvT023812
	for <patchwork-linux-fbdev@patchwork.kernel.org>;
	Tue, 11 Jan 2011 12:45:35 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755804Ab1AKMoi (ORCPT
	<rfc822;patchwork-linux-fbdev@patchwork.kernel.org>);
	Tue, 11 Jan 2011 07:44:38 -0500
Received: from mail-wy0-f174.google.com ([74.125.82.174]:45082 "EHLO
	mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754139Ab1AKMog (ORCPT
	<rfc822;linux-fbdev@vger.kernel.org>);
	Tue, 11 Jan 2011 07:44:36 -0500
Received: by mail-wy0-f174.google.com with SMTP id 28so20414600wyb.19
	for <multiple recipients>; Tue, 11 Jan 2011 04:44:35 -0800 (PST)
Received: by 10.216.158.21 with SMTP id p21mr2774191wek.99.1294749875752;
	Tue, 11 Jan 2011 04:44:35 -0800 (PST)
Received: from localhost (cpc1-chap8-2-0-cust102.aztw.cable.virginmedia.com
	[94.169.120.103]) by mx.google.com with ESMTPS id
	n11sm14697393wej.19.2011.01.11.04.44.30
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Tue, 11 Jan 2011 04:44:30 -0800 (PST)
From: Jamie Iles <jamie@jamieiles.com>
To: linux-kernel@vger.kernel.org
Cc: Jamie Iles <jamie@jamieiles.com>, Wan ZongShun <mcuos.com@gmail.com>,
	linux-fbdev@vger.kernel.org
Subject: [PATCH 06/16] nuc900fb: don't treat NULL clk as an error
Date: Tue, 11 Jan 2011 12:43:43 +0000
Message-Id: <1294749833-32019-7-git-send-email-jamie@jamieiles.com>
X-Mailer: git-send-email 1.7.3.4
In-Reply-To: <1294749833-32019-1-git-send-email-jamie@jamieiles.com>
References: <1294749833-32019-1-git-send-email-jamie@jamieiles.com>
Sender: linux-fbdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-fbdev.vger.kernel.org>
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]);
	Tue, 11 Jan 2011 12:45:35 +0000 (UTC)


diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index 81687ed..62498bd 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -15,6 +15,7 @@
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
@@ -597,9 +598,9 @@ static int __devinit nuc900fb_probe(struct platform_device *pdev)
 	}
 
 	fbi->clk = clk_get(&pdev->dev, NULL);
-	if (!fbi->clk || IS_ERR(fbi->clk)) {
+	if (IS_ERR(fbi->clk)) {
 		printk(KERN_ERR "nuc900-lcd:failed to get lcd clock source\n");
-		ret = -ENOENT;
+		ret = PTR_ERR(fbi->clk);
 		goto release_irq;
 	}