Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-omap-h63xx.git] / drivers / net / cpmac.c

diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index c85194f2cd2dc2b8a9bf5628e63b9189db0ec2cd..9da7ff437031fec11854152851c344608ec183ff 100644 (file)
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -987,7 +987,7 @@ static int external_switch;
 static int __devinit cpmac_probe(struct platform_device *pdev)
 {
        int rc, phy_id, i;
-       int mdio_bus_id = cpmac_mii.id;
+       char *mdio_bus_id = "0";
        struct resource *mem;
        struct cpmac_priv *priv;
        struct net_device *dev;
@@ -1008,8 +1008,6 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
                if (external_switch || dumb_switch) {
                        struct fixed_phy_status status = {};
 
-                       mdio_bus_id = 0;
-
                        /*
                         * FIXME: this should be in the platform code!
                         * Since there is not platform code at all (that is,
@@ -1143,6 +1141,7 @@ int __devinit cpmac_init(void)
        }
 
        cpmac_mii.phy_mask = ~(mask | 0x80000000);
+       snprintf(cpmac_mii.id, MII_BUS_ID_SIZE, "0");
 
        res = mdiobus_register(&cpmac_mii);
        if (res)