From 355311a80116be82159864d686813124059f022d Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 10 Mar 2013 03:57:49 +0000 Subject: [PATCH] --- yaml --- r: 368179 b: refs/heads/master c: 624e2d21356a40ad7200cb30c4f966741d805a79 h: refs/heads/master i: 368177: 61bdf9ae33a7e7416a185d2d55192f5d5caf19ee 368175: c0ea518ba58c9b72e0b09a74d9b46bf995539019 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ee3f050fdec3..48652f1e04d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a80b5e1580cf6b2c534674080dc3fdf788b06b8 +refs/heads/master: 624e2d21356a40ad7200cb30c4f966741d805a79 diff --git a/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c index b45e5fd46df6..db343a1d0835 100644 --- a/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1670,7 +1670,7 @@ static int bcm_enet_probe(struct platform_device *pdev) ret = PTR_ERR(priv->mac_clk); goto out; } - clk_enable(priv->mac_clk); + clk_prepare_enable(priv->mac_clk); /* initialize default and fetch platform data */ priv->rx_ring_size = BCMENET_DEF_RX_DESC; @@ -1699,7 +1699,7 @@ static int bcm_enet_probe(struct platform_device *pdev) priv->phy_clk = NULL; goto out_put_clk_mac; } - clk_enable(priv->phy_clk); + clk_prepare_enable(priv->phy_clk); } /* do minimal hardware init to be able to probe mii bus */ @@ -1800,12 +1800,12 @@ static int bcm_enet_probe(struct platform_device *pdev) /* turn off mdc clock */ enet_writel(priv, 0, ENET_MIISC_REG); if (priv->phy_clk) { - clk_disable(priv->phy_clk); + clk_disable_unprepare(priv->phy_clk); clk_put(priv->phy_clk); } out_put_clk_mac: - clk_disable(priv->mac_clk); + clk_disable_unprepare(priv->mac_clk); clk_put(priv->mac_clk); out: free_netdev(dev); @@ -1843,10 +1843,10 @@ static int bcm_enet_remove(struct platform_device *pdev) /* disable hw block clocks */ if (priv->phy_clk) { - clk_disable(priv->phy_clk); + clk_disable_unprepare(priv->phy_clk); clk_put(priv->phy_clk); } - clk_disable(priv->mac_clk); + clk_disable_unprepare(priv->mac_clk); clk_put(priv->mac_clk); platform_set_drvdata(pdev, NULL);