Skip to content

Commit

Permalink
stmmac: use MII_BUS_ID_SIZE instead of BUS_ID_SIZE
Browse files Browse the repository at this point in the history
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Giuseppe CAVALLARO authored and David S. Miller committed Jan 8, 2010
1 parent 596a530 commit 109cdd6
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/net/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down

0 comments on commit 109cdd6

Please sign in to comment.