Merge branch 'master' of git://git.denx.de/u-boot-mmc

[u-boot] / drivers / net / smc911x.c

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index cac08d0a7cccac93058fef90009316f02420114c..aeafeba44cb22d6d07ac829a12914bfff722df6a 100644 (file)
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -103,11 +103,11 @@ static void smc911x_phy_configure(struct eth_device *dev)
 
        smc911x_phy_reset(dev);
 
-       smc911x_miiphy_write(dev, 1, PHY_BMCR, PHY_BMCR_RESET);
+       smc911x_miiphy_write(dev, 1, MII_BMCR, BMCR_RESET);
        mdelay(1);
-       smc911x_miiphy_write(dev, 1, PHY_ANAR, 0x01e1);
-       smc911x_miiphy_write(dev, 1, PHY_BMCR, PHY_BMCR_AUTON |
-                               PHY_BMCR_RST_NEG);
+       smc911x_miiphy_write(dev, 1, MII_ADVERTISE, 0x01e1);
+       smc911x_miiphy_write(dev, 1, MII_BMCR, BMCR_ANENABLE |
+                               BMCR_ANRESTART);
 
        timeout = 5000;
        do {
@@ -115,9 +115,9 @@ static void smc911x_phy_configure(struct eth_device *dev)
                if ((timeout--) == 0)
                        goto err_out;
 
-               if (smc911x_miiphy_read(dev, 1, PHY_BMSR, &status) != 0)
+               if (smc911x_miiphy_read(dev, 1, MII_BMSR, &status) != 0)
                        goto err_out;
-       } while (!(status & PHY_BMSR_LS));
+       } while (!(status & BMSR_LSTATUS));
 
        printf(DRIVERNAME ": phy initialized\n");
 
@@ -220,7 +220,7 @@ static int smc911x_rx(struct eth_device *dev)
 
                smc911x_reg_write(dev, RX_CFG, 0);
 
-               tmplen = (pktlen + 2+ 3) / 4;
+               tmplen = (pktlen + 3) / 4;
                while (tmplen--)
                        *data++ = pkt_data_pull(dev, RX_DATA_FIFO);
 
@@ -242,7 +242,6 @@ int smc911x_initialize(u8 dev_num, int base_addr)
 
        dev = malloc(sizeof(*dev));
        if (!dev) {
-               free(dev);
                return -1;
        }
        memset(dev, 0, sizeof(*dev));