From: Jamie Iles <jamie@jamieiles.com>
To: linux-kernel@vger.kernel.org
Cc: Jamie Iles <jamie@jamieiles.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
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 [thread overview]
Message-ID: <1294749833-32019-11-git-send-email-jamie@jamieiles.com> (raw)
In-Reply-To: <1294749833-32019-1-git-send-email-jamie@jamieiles.com>
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 <peppe.cavallaro@st.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
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 <linux/clk.h>
+#include <linux/err.h>
#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) {
--
1.7.3.4
next prev parent reply other threads:[~2011-01-11 12:46 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-11 12:43 [PATCH 00/16] don't treat NULL from clk_get() " Jamie Iles
2011-01-11 12:43 ` [PATCH 01/16] crypto: omap-aes: don't treat NULL clk " Jamie Iles
2011-01-11 15:56 ` Aaro Koskinen
2011-01-12 14:32 ` Dmitry Kasatkin
2011-01-12 19:38 ` Tobias Karnat
2011-01-12 21:51 ` Jamie Iles
2011-01-13 2:25 ` Tobias Karnat
2011-01-11 12:43 ` [PATCH 02/16] crypto: omap-sham: " Jamie Iles
2011-01-11 15:56 ` Aaro Koskinen
2011-01-12 14:32 ` Dmitry Kasatkin
2011-01-29 5:01 ` Herbert Xu
2011-01-11 12:43 ` [PATCH 03/16] input: tnetv107x-keypad: " Jamie Iles
2011-01-11 12:43 ` [PATCH 04/16] input: tnetv107x-touchscreen: " Jamie Iles
2011-01-12 5:56 ` Dmitry Torokhov
2011-01-18 4:25 ` Dmitry Torokhov
2011-01-18 4:35 ` Dmitry Torokhov
2011-01-11 12:43 ` [PATCH 05/16] s3c2410fb: " Jamie Iles
2011-01-12 6:00 ` Paul Mundt
2011-01-11 12:43 ` [PATCH 06/16] nuc900fb: " Jamie Iles
2011-01-12 1:24 ` Wan ZongShun
2011-01-12 6:00 ` Paul Mundt
2011-01-11 12:43 ` [PATCH 07/16] staging: tidspbridge: " Jamie Iles
2011-01-11 15:50 ` Aaro Koskinen
2011-01-11 16:40 ` Jamie Iles
2011-01-11 12:43 ` [PATCH 08/16] ARM: samsung: serial: " Jamie Iles
2011-01-11 21:14 ` Russell King - ARM Linux
2011-01-12 2:21 ` Kukjin Kim
2011-01-11 12:43 ` [PATCH 09/16] ARM: pxa: " Jamie Iles
2011-01-11 21:14 ` Russell King - ARM Linux
2011-01-11 12:43 ` Jamie Iles [this message]
2011-01-12 8:00 ` [PATCH 10/16] drivers/net: stmmac: " Peppe CAVALLARO
2011-01-11 12:43 ` [PATCH 11/16] drivers/net: sh_irda: " Jamie Iles
2011-01-11 12:43 ` [PATCH 12/16] mtd: mpc5121_nfc: " Jamie Iles
2011-01-11 15:15 ` Wolfram Sang
2011-01-18 12:09 ` Artem Bityutskiy
2011-01-11 12:43 ` [PATCH 13/16] MMC: jz4740: " Jamie Iles
2011-01-11 23:22 ` Chris Ball
2011-01-11 12:43 ` [PATCH 14/16] can: mpc5xxx_can: " Jamie Iles
2011-01-11 15:18 ` Wolfram Sang
2011-01-11 12:43 ` [PATCH 15/16] spi: dw_spi: " Jamie Iles
2011-01-11 15:20 ` Grant Likely
2011-01-11 12:43 ` [PATCH 16/16] w1: mxc_w1: " Jamie Iles
2011-01-11 15:10 ` Sascha Hauer
2011-01-11 21:15 ` Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294749833-32019-11-git-send-email-jamie@jamieiles.com \
--to=jamie@jamieiles.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®