diff options
author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2011-10-18 00:01:23 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-19 19:24:17 -0400 |
commit | 38fe7a93fc734357c4811f1c710b1906a87d315c (patch) | |
tree | 3b3fff1fcbbf9f39cb766ba004290976c99b0912 /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |
parent | stmmac: use predefined macros for HW cap register fields (V4) (diff) | |
download | linux-dev-38fe7a93fc734357c4811f1c710b1906a87d315c.tar.xz linux-dev-38fe7a93fc734357c4811f1c710b1906a87d315c.zip |
stmmac: allow mmc usage only if feature actually available (V4)
Enable the MMC support if it is actually available from the
HW capability register.
Signed-off-by: Rayagond Kokatanur <rayagond@vayavyalabs.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index c88dc358f9b0..bf895cb75785 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -946,7 +946,8 @@ static int stmmac_open(struct net_device *dev) memset(&priv->xstats, 0, sizeof(struct stmmac_extra_stats)); priv->xstats.threshold = tc; - stmmac_mmc_setup(priv); + if (priv->dma_cap.rmon) + stmmac_mmc_setup(priv); /* Start the ball rolling... */ DBG(probe, DEBUG, "%s: DMA RX/TX processes started...\n", dev->name); |