stmmac: use MII_BUS_ID_SIZE instead of BUS_ID_SIZE
Giuseppe CAVALLARO [Wed, 6 Jan 2010 23:07:11 +0000 (23:07 +0000)]
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/stmmac/stmmac_main.c

index 508fba8..79a9381 100644 (file)
@@ -305,8 +305,8 @@ static int stmmac_init_phy(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
        struct phy_device *phydev;
-       char phy_id[BUS_ID_SIZE];       /* PHY to connect */
-       char bus_id[BUS_ID_SIZE];
+       char phy_id[MII_BUS_ID_SIZE + 3];
+       char bus_id[MII_BUS_ID_SIZE];
 
        priv->oldlink = 0;
        priv->speed = 0;
@@ -318,7 +318,8 @@ static int stmmac_init_phy(struct net_device *dev)
        }
 
        snprintf(bus_id, MII_BUS_ID_SIZE, "%x", priv->bus_id);
-       snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, bus_id, priv->phy_addr);
+       snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
+                priv->phy_addr);
        pr_debug("stmmac_init_phy:  trying to attach to %s\n", phy_id);
 
        phydev = phy_connect(dev, phy_id, &stmmac_adjust_link, 0,