diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-02 11:25:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-02 11:25:43 -0700 |
| commit | 739e4a758e0e2930f4bcdddd244254bae8dd7499 (patch) | |
| tree | 0179d038669ad55591ae05a90b210d7090edf56e /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |
| parent | d068b02cfdfc27f5962ec82ec5568b706f599edc (diff) | |
| parent | 50dddff3cb9af328dd42bafe3437c7f47e8b38a9 (diff) | |
| download | blackbird-op-linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.tar.gz blackbird-op-linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
net/netfilter/nfnetlink.c
Both r8152 and nfnetlink conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 9dbb02d9d9c2..9979f67de3aa 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2786,8 +2786,15 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device, if (IS_ERR(priv->stmmac_clk)) { dev_warn(priv->device, "%s: warning: cannot get CSR clock\n", __func__); - ret = PTR_ERR(priv->stmmac_clk); - goto error_clk_get; + /* If failed to obtain stmmac_clk and specific clk_csr value + * is NOT passed from the platform, probe fail. + */ + if (!priv->plat->clk_csr) { + ret = PTR_ERR(priv->stmmac_clk); + goto error_clk_get; + } else { + priv->stmmac_clk = NULL; + } } clk_prepare_enable(priv->stmmac_clk); |
