From patchwork Tue Jan 11 12:43:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamie Iles X-Patchwork-Id: 78366 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CF553B7082 for ; Tue, 11 Jan 2011 23:46:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756056Ab1AKMoq (ORCPT ); Tue, 11 Jan 2011 07:44:46 -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 S1756042Ab1AKMop (ORCPT ); Tue, 11 Jan 2011 07:44:45 -0500 Received: by mail-wy0-f174.google.com with SMTP id 28so20414600wyb.19 for ; Tue, 11 Jan 2011 04:44:44 -0800 (PST) Received: by 10.227.176.134 with SMTP id be6mr1007597wbb.147.1294749884350; Tue, 11 Jan 2011 04:44:44 -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 j49sm13501358wer.38.2011.01.11.04.44.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 11 Jan 2011 04:44:43 -0800 (PST) From: Jamie Iles To: linux-kernel@vger.kernel.org Cc: Jamie Iles , Samuel Ortiz , netdev@vger.kernel.org Subject: [PATCH 11/16] drivers/net: sh_irda: don't treat NULL clk as an error Date: Tue, 11 Jan 2011 12:43:48 +0000 Message-Id: <1294749833-32019-12-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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org clk_get() returns a struct clk cookie to the driver and some platforms may return NULL if they only support a single clock. clk_get() has only failed if it returns a ERR_PTR() encoded pointer. Cc: Samuel Ortiz Cc: netdev@vger.kernel.org Signed-off-by: Jamie Iles --- drivers/net/irda/sh_sir.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c index 52a7c86..56ba91a 100644 --- a/drivers/net/irda/sh_sir.c +++ b/drivers/net/irda/sh_sir.c @@ -12,6 +12,7 @@ * published by the Free Software Foundation. */ +#include #include #include #include @@ -278,9 +279,9 @@ static int sh_sir_set_baudrate(struct sh_sir_self *self, u32 baudrate) } clk = clk_get(NULL, "irda_clk"); - if (!clk) { + if (IS_ERR(clk)) { dev_err(dev, "can not get irda_clk\n"); - return -EIO; + return PTR_ERR(clk); } clk_set_rate(clk, sh_sir_find_sclk(clk));