---

yaml --- r: 323100 b: refs/heads/master c: 6861509 h: refs/heads/master v: v3
git-mirror · Sep 21, 2012 · 0485a90 · 0485a90
1 parent 6ed6d75
commit 0485a90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28889b7e7818342f6c254e27b9b2c68702ab867a
+refs/heads/master: 6861509f9fee9c5e568c5f6852bb96f2475b4179
diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c b/trunk/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) {