Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

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

diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c
index 85660c0216e725caf793022008601802a8772b13..b67153bec89d2004cc02a9d89653831340f764b3 100644 (file)
--- a/drivers/net/xilinx_ll_temac.c
+++ b/drivers/net/xilinx_ll_temac.c
@@ -232,6 +232,7 @@ static void ll_temac_halt(struct eth_device *dev)
 static int ll_temac_init(struct eth_device *dev, bd_t *bis)
 {
        struct ll_temac *ll_temac = dev->priv;
+       int ret;
 
        printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08X.\n",
                dev->name, dev->index, dev->iobase);
@@ -240,7 +241,12 @@ static int ll_temac_init(struct eth_device *dev, bd_t *bis)
                return -1;
 
        /* Start up the PHY */
-       phy_startup(ll_temac->phydev);
+       ret = phy_startup(ll_temac->phydev);
+       if (ret) {
+               printf("%s: Could not initialize PHY %s\n",
+                      dev->name, ll_temac->phydev->dev->name);
+               return ret;
+       }
 
        if (!ll_temac_adjust_link(dev)) {
                ll_temac_halt(dev);
@@ -298,9 +304,9 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
 
        /* use given name or generate its own unique name */
        if (devinf->devname) {
-               strncpy(dev->name, devinf->devname, NAMESIZE);
+               strncpy(dev->name, devinf->devname, sizeof(dev->name));
        } else {
-               snprintf(dev->name, NAMESIZE, "lltemac.%lx", devinf->base_addr);
+               snprintf(dev->name, sizeof(dev->name), "lltemac.%lx", devinf->base_addr);
                devinf->devname = dev->name;
        }