From: Kelvin Cheung Date: Sat, 18 Aug 2012 00:16:23 +0000 (+0000) Subject: net/stmmac: fix issue of clk_get for Loongson1B. X-Git-Tag: upstream/snapshot3+hdmi~6792^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae4d8cf299dbea4ce387a01da6f723c4050b31a7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git net/stmmac: fix issue of clk_get for Loongson1B. When getting clock, give a chance to the CPUs without DT support, which use Common Clock Framework, such as Loongson1B. Signed-off-by: Kelvin Cheung Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index fd8882f..c136162 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/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;