---

yaml --- r: 271615 b: refs/heads/master c: 5e6efe8 h: refs/heads/master i: 271613: 6c2ee5f 271611: e5fbd6d 271607: 360320f 271599: 901938e 271583: 30817fd 271551: fa68e7a 271487: ffecfe7 271359: 475eba0 v: v3
git-mirror · Oct 28, 2011 · e36eb74 · e36eb74
1 parent 983d8ca
commit e36eb74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3a7ae2c1819aa210a38f80f6bf13322652c8211
+refs/heads/master: 5e6efe88c54ad79353666f5371b5b97c0e16111e
diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/trunk/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;