From af9d95a051d715fb091123bcd7400cde0888fdb5 Mon Sep 17 00:00:00 2001 From: David Daney Date: Thu, 23 Feb 2012 11:19:31 -0800 Subject: [PATCH] --- yaml --- r: 289137 b: refs/heads/master c: b5c19ca8014aa5151712274d5e70c3666a8918c1 h: refs/heads/master i: 289135: 34c4f7382ad5dc0728489b1fe8834bad9edaca08 v: v3 --- [refs] | 2 +- trunk/drivers/staging/octeon/ethernet-mdio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 55ac5dba6f20..74e33d2d5690 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47de87a234aac8b2121557f3903bb16bb678af67 +refs/heads/master: b5c19ca8014aa5151712274d5e70c3666a8918c1 diff --git a/trunk/drivers/staging/octeon/ethernet-mdio.c b/trunk/drivers/staging/octeon/ethernet-mdio.c index 63800ba71d06..e31949c9c87e 100644 --- a/trunk/drivers/staging/octeon/ethernet-mdio.c +++ b/trunk/drivers/staging/octeon/ethernet-mdio.c @@ -164,9 +164,9 @@ int cvm_oct_phy_setup_device(struct net_device *dev) int phy_addr = cvmx_helper_board_get_mii_address(priv->port); if (phy_addr != -1) { - char phy_id[20]; + char phy_id[MII_BUS_ID_SIZE + 3]; - snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "0", phy_addr); + snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "mdio-octeon-0", phy_addr); priv->phydev = phy_connect(dev, phy_id, cvm_oct_adjust_link, 0, PHY_INTERFACE_MODE_GMII);