From patchwork Tue Jan 11 12:43:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamie Iles X-Patchwork-Id: 78368 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 BBAE7B6F1E for ; Tue, 11 Jan 2011 23:47:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932083Ab1AKMql (ORCPT ); Tue, 11 Jan 2011 07:46:41 -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 S1756029Ab1AKMon (ORCPT ); Tue, 11 Jan 2011 07:44:43 -0500 Received: by mail-wy0-f174.google.com with SMTP id 28so20414600wyb.19 for ; Tue, 11 Jan 2011 04:44:42 -0800 (PST) Received: by 10.216.4.82 with SMTP id 60mr2804407wei.89.1294749882487; Tue, 11 Jan 2011 04:44:42 -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 r38sm14716505weq.47.2011.01.11.04.44.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 11 Jan 2011 04:44:42 -0800 (PST) From: Jamie Iles To: linux-kernel@vger.kernel.org Cc: Jamie Iles , Giuseppe Cavallaro , netdev@vger.kernel.org Subject: [PATCH 10/16] drivers/net: stmmac: don't treat NULL clk as an error Date: Tue, 11 Jan 2011 12:43:47 +0000 Message-Id: <1294749833-32019-11-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: Giuseppe Cavallaro Cc: netdev@vger.kernel.org Signed-off-by: Jamie Iles --- drivers/net/stmmac/stmmac_timer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/stmmac/stmmac_timer.c b/drivers/net/stmmac/stmmac_timer.c index 2a0e1ab..ebb1b37 100644 --- a/drivers/net/stmmac/stmmac_timer.c +++ b/drivers/net/stmmac/stmmac_timer.c @@ -91,6 +91,7 @@ int stmmac_close_ext_timer(void) #elif defined(CONFIG_STMMAC_TMU_TIMER) #include +#include #define TMU_CHANNEL "tmu2_clk" static struct clk *timer_clock; @@ -109,7 +110,7 @@ int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm) { timer_clock = clk_get(NULL, TMU_CHANNEL); - if (timer_clock == NULL) + if (IS_ERR(timer_clock)) return -1; if (tmu2_register_user(stmmac_timer_handler, (void *)dev) < 0) {