diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-01-06 23:07:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-07 17:06:05 -0800 |
| commit | 109cdd66485b639b2fbfcbf59ae7ef1286520705 (patch) | |
| tree | 91109f8200db4f15d60cd655d0e717aafc3e4844 /drivers/net/stmmac | |
| parent | 596a530bb3af746d33ea2910a0569b9825279979 (diff) | |
stmmac: use MII_BUS_ID_SIZE instead of BUS_ID_SIZE
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac')
| -rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index 508fba8fa07..79a93811787 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c @@ -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, |