From e36eb74819f0294a59e678c506f840b3199616c2 Mon Sep 17 00:00:00 2001
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Wed, 26 Oct 2011 19:43:07 +0000
Subject: [PATCH] --- yaml --- r: 271615 b: refs/heads/master c:
 5e6efe88c54ad79353666f5371b5b97c0e16111e h: refs/heads/master i:   271613:
 6c2ee5ff7055ee07f9802047a0e720359619cfba   271611:
 e5fbd6da340d29f5d1ab22002c423ff53ce42517   271607:
 360320f877ab6570ee2a3b572e82e1daaeae5783   271599:
 901938ef51047ca871a276783e6153d0ef18fd0a   271583:
 30817fdb2b3f86666b5a2ec2e7fcd19750a3d197   271551:
 fa68e7a77c3c27dba1f667039dd6b3be61c81049   271487:
 ffecfe70e10bd6eef08fbbc6209dc95a06f7f04d   271359:
 475eba0b182f10222f01afb4e9d734671aca675a v: v3

---
 [refs]                                                  | 2 +-
 trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 858b7a6a1bb1..94653961ede8 100644
--- 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
index aeaa15b451de..fcdd5a2cbb55 100644
--- 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;