summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-20 21:06:10 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-21 13:47:24 -0400
commit6861509f9fee9c5e568c5f6852bb96f2475b4179 (patch)
tree3ae0f598217e303a3b10b25fccb904547fb46ba1
parent28889b7e7818342f6c254e27b9b2c68702ab867a (diff)
downloadlinux-3.10-6861509f9fee9c5e568c5f6852bb96f2475b4179.tar.gz
linux-3.10-6861509f9fee9c5e568c5f6852bb96f2475b4179.tar.bz2
linux-3.10-6861509f9fee9c5e568c5f6852bb96f2475b4179.zip
stmmac: fix return value check in stmmac_open_ext_timer()
In case of error, the function clk_get() returns ERR_PTR() and never returns NULL pointer. The NULL test in the error handling should be replaced with IS_ERR(). dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
index 2a0e1abde7e..197fb8cde1d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
@@ -109,7 +109,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) {