aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cpmac.c
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-08-04 10:52:41 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-05 12:20:57 -0700
commitd76c626b922e279c7764ec46fb1b9bbd41538f35 (patch)
tree986ab4d02541db65c35888d851a8392f852fcfee /drivers/net/cpmac.c
parent36cbd3dcc10384f813ec0814255f576c84f2bcd4 (diff)
downloadkernel_samsung_smdk4412-d76c626b922e279c7764ec46fb1b9bbd41538f35.zip
kernel_samsung_smdk4412-d76c626b922e279c7764ec46fb1b9bbd41538f35.tar.gz
kernel_samsung_smdk4412-d76c626b922e279c7764ec46fb1b9bbd41538f35.tar.bz2
cpmac: fix wrong MDIO bus identifier
This patch fixes the wrong MDIO bus identifier which was set to 0 unconditionaly, suitable for external switches while it is actually 1 for PHYs different than external switches which are autodetected. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cpmac.c')
-rw-r--r--drivers/net/cpmac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index fd5e32c..c951dd4 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1109,7 +1109,7 @@ static int external_switch;
static int __devinit cpmac_probe(struct platform_device *pdev)
{
int rc, phy_id;
- char *mdio_bus_id = "0";
+ char mdio_bus_id[BUS_ID_SIZE];
struct resource *mem;
struct cpmac_priv *priv;
struct net_device *dev;
@@ -1127,7 +1127,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
if (phy_id == PHY_MAX_ADDR) {
if (external_switch || dumb_switch) {
- mdio_bus_id = 0; /* fixed phys bus */
+ strncpy(mdio_bus_id, "0", BUS_ID_SIZE); /* fixed phys bus */
phy_id = pdev->id;
} else {
dev_err(&pdev->dev, "no PHY present\n");
@@ -1254,7 +1254,7 @@ int __devinit cpmac_init(void)
}
cpmac_mii->phy_mask = ~(mask | 0x80000000);
- snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "0");
+ snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
res = mdiobus_register(cpmac_mii);
if (res)