Skip to content

Commit

Permalink
cpmac: fix wrong MDIO bus identifier
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Aug 5, 2009
1 parent 36cbd3d commit d76c626
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/cpmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit d76c626

Please sign in to comment.