diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2011-10-26 19:43:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-27 23:17:11 -0400 |
| commit | 5e6efe88c54ad79353666f5371b5b97c0e16111e (patch) | |
| tree | 4e6af2da84ec10be1cf8fb033a3627e222b5a9fe /drivers | |
| parent | e3a7ae2c1819aa210a38f80f6bf13322652c8211 (diff) | |
| download | linux-3.10-5e6efe88c54ad79353666f5371b5b97c0e16111e.tar.gz linux-3.10-5e6efe88c54ad79353666f5371b5b97c0e16111e.tar.bz2 linux-3.10-5e6efe88c54ad79353666f5371b5b97c0e16111e.zip | |
stmmac: fix a bug while checking the HW cap reg (v2)
The patch fixes a bug while checking the HW cap reg
on old MAC10/100 where this feature is not available.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index aeaa15b451d..fcdd5a2cbb5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -812,9 +812,10 @@ static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv) */ static int stmmac_get_hw_features(struct stmmac_priv *priv) { - u32 hw_cap = priv->hw->dma->get_hw_feature(priv->ioaddr); + u32 hw_cap = 0; + if (priv->hw->dma->get_hw_feature) { + hw_cap = priv->hw->dma->get_hw_feature(priv->ioaddr); - if (likely(hw_cap)) { priv->dma_cap.mbps_10_100 = (hw_cap & DMA_HW_FEAT_MIISEL); priv->dma_cap.mbps_1000 = (hw_cap & DMA_HW_FEAT_GMIISEL) >> 1; priv->dma_cap.half_duplex = (hw_cap & DMA_HW_FEAT_HDSEL) >> 2; |