diff options
| author | Kelvin Cheung <keguang.zhang@gmail.com> | 2012-08-18 02:16:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-20 11:52:20 +0200 |
| commit | ae4d8cf299dbea4ce387a01da6f723c4050b31a7 (patch) | |
| tree | 9c1459fa99b5c756f1a372c52cc0b0df04ea69a8 | |
| parent | caif: Do not dereference NULL in chnl_recv_cb() (diff) | |
| download | linux-ae4d8cf299dbea4ce387a01da6f723c4050b31a7.tar.xz linux-ae4d8cf299dbea4ce387a01da6f723c4050b31a7.zip | |
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 <keguang.zhang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index fd8882f9602a..c136162e6473 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; |