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

[karo-tx-uboot.git] / drivers / net / smc911x.c

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 613d9028f0edfa878e5653c33388b124b5b079bd..d674ce2297b89e456e5d0d9e8e7725b3e80643ea 100644 (file)
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -37,7 +37,7 @@ void pkt_data_push(struct eth_device *dev, u32 addr, u32 val) \
 
 #define mdelay(n)       udelay((n)*1000)
 
-static void smx911x_handle_mac_address(struct eth_device *dev)
+static void smc911x_handle_mac_address(struct eth_device *dev)
 {
        unsigned long addrh, addrl;
        uchar *m = dev->enetaddr;
@@ -155,7 +155,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd)
        /* Configure the PHY, initialize the link state */
        smc911x_phy_configure(dev);
 
-       smx911x_handle_mac_address(dev);
+       smc911x_handle_mac_address(dev);
 
        /* Turn on Tx + Rx */
        smc911x_enable(dev);
@@ -243,7 +243,7 @@ int smc911x_initialize(u8 dev_num, int base_addr)
        dev = malloc(sizeof(*dev));
        if (!dev) {
                free(dev);
-               return 0;
+               return -1;
        }
        memset(dev, 0, sizeof(*dev));
 
@@ -277,5 +277,5 @@ int smc911x_initialize(u8 dev_num, int base_addr)
        }
 
        eth_register(dev);
-       return 0;
+       return 1;
 }