drivers/video/am335x-fb: Properly point framebuffer behind palette

[platform/kernel/u-boot.git] / drivers / net / greth.c

diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 0624eb8..aa5d711 100644 (file)
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -245,7 +245,7 @@ int greth_init_phy(greth_priv * dev, bd_t * bis)
        debug("GRETH PHY ADDRESS: %d\n", phyaddr);
 
        /* X msecs to ticks */
-       timeout = usec2ticks(GRETH_PHY_TIMEOUT_MS * 1000);
+       timeout = GRETH_PHY_TIMEOUT_MS * 1000;
 
        /* Get system timer0 current value
         * Total timeout is 5s
@@ -640,9 +640,9 @@ int greth_initialize(bd_t * bis)
 
        /* Make descriptor string */
        if (greth->gbit_mac) {
-               sprintf(dev->name, "GRETH_10/100/GB");
+               strcpy(dev->name, "GRETH_10/100/GB");
        } else {
-               sprintf(dev->name, "GRETH_10/100");
+               strcpy(dev->name, "GRETH_10/100");
        }
 
        /* initiate PHY, select speed/duplex depending on connected PHY */