---

yaml --- r: 322044 b: refs/heads/master c: ae4d8cf h: refs/heads/master v: v3
git-mirror · Aug 20, 2012 · 1d232b8 · 1d232b8
1 parent a2c5a8b
commit 1d232b8
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: d92c7f8aabae913de16eb855b19cd2002c341896
+refs/heads/master: ae4d8cf299dbea4ce387a01da6f723c4050b31a7
diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2077,7 +2077,7 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
 		goto error_netdev_register;
 	}
 
-	priv->stmmac_clk = clk_get(priv->device, NULL);
+	priv->stmmac_clk = clk_get(priv->device, STMMAC_RESOURCE_NAME);
 	if (IS_ERR(priv->stmmac_clk)) {
 		pr_warning("%s: warning: cannot get CSR clock\n", __func__);
 		goto error_clk_get;