Patchwork TI DaVinci EMAC : Fix rmmod error

login
register
mail settings
Submitter chaithrika@ti.com
Date June 17, 2009, 11:28 a.m.
Message ID <1245238134-23512-1-git-send-email-chaithrika@ti.com>
Download mbox | patch
Permalink /patch/28786/
State Accepted
Delegated to: David Miller
Headers show

Comments

chaithrika@ti.com - June 17, 2009, 11:28 a.m.
clk_disable was called twice in the remove function.
Correct this so that the driver module unloads without error.

Signed-off-by: Chaithrika U S <chaithrika@ti.com>
---
Applies to Linus' kernel tree

 drivers/net/davinci_emac.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Kevin Hilman - June 19, 2009, 8:54 p.m.
Chaithrika U S <chaithrika@ti.com> writes:

> clk_disable was called twice in the remove function.
> Correct this so that the driver module unloads without error.
>
> Signed-off-by: Chaithrika U S <chaithrika@ti.com>

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
(TI DaVinci arch maintainer)

Will pull into DaVinci git until it merges upstream.

Kevin

> ---
> Applies to Linus' kernel tree
>
>  drivers/net/davinci_emac.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
> index 0e9b9f9..2df8fb0 100644
> --- a/drivers/net/davinci_emac.c
> +++ b/drivers/net/davinci_emac.c
> @@ -2767,7 +2767,6 @@ static int __devexit davinci_emac_remove(struct platform_device *pdev)
>  
>  	dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");
>  
> -	clk_disable(emac_clk);
>  	platform_set_drvdata(pdev, NULL);
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	mdiobus_unregister(priv->mii_bus);
> -- 
> 1.5.6
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> Davinci-linux-open-source@linux.davincidsp.com
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 0e9b9f9..2df8fb0 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -2767,7 +2767,6 @@  static int __devexit davinci_emac_remove(struct platform_device *pdev)
 
 	dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");
 
-	clk_disable(emac_clk);
 	platform_set_drvdata(pdev, NULL);
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	mdiobus_unregister(priv->mii_bus);