1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index 8bb0db990c8f..0f3e7f21c6fa 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -721,10 +721,7 @@ static int ethoc_mdio_probe(struct net_device *dev)
                 return err;
         }
 
-        phy->advertising &= ~(ADVERTISED_1000baseT_Full |
-                              ADVERTISED_1000baseT_Half);
-        phy->supported &= ~(SUPPORTED_1000baseT_Full |
-                            SUPPORTED_1000baseT_Half);
+        phy_set_max_speed(phy, SPEED_100);
 
         return 0;
 }
@@ -1141,7 +1138,8 @@ static int ethoc_probe(struct platform_device *pdev)
         dev_dbg(&pdev->dev, "ethoc: num_tx: %d num_rx: %d\n",
                 priv->num_tx, priv->num_rx);
 
-        priv->vma = devm_kzalloc(&pdev->dev, num_bd*sizeof(void *), GFP_KERNEL);
+        priv->vma = devm_kcalloc(&pdev->dev, num_bd, sizeof(void *),
+                                 GFP_KERNEL);
         if (!priv->vma) {
                 ret = -ENOMEM;
                 goto free;
@@ -1246,8 +1244,7 @@ error:
         mdiobus_unregister(priv->mdio);
         mdiobus_free(priv->mdio);
 free2:
-        if (priv->clk)
-                clk_disable_unprepare(priv->clk);
+        clk_disable_unprepare(priv->clk);
 free:
         free_netdev(netdev);
 out:
@@ -1271,8 +1268,7 @@ static int ethoc_remove(struct platform_device *pdev)
                         mdiobus_unregister(priv->mdio);
                         mdiobus_free(priv->mdio);
                 }
-                if (priv->clk)
-                        clk_disable_unprepare(priv->clk);
+                clk_disable_unprepare(priv->clk);
                 unregister_netdev(netdev);
                 free_netdev(netdev);
         }