* [PATCH] t7l66xb: properly free clk32k clock source
@ 2010-07-01 9:43 Axel Lin
2010-07-02 15:16 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2010-07-01 9:43 UTC (permalink / raw)
To: linux-kernel
Cc: Samuel Ortiz, Magnus Damm, H Hartley Sweeten, Julia Lawall, Tejun Heo
This patch includes below fixes to properly free clk32k clock source:
1. remove a redundant clk_put in t7l66xb_probe error path
2. add missing clk_disable(t7l66xb->clk32k) and clk_put(t7l66xb->clk32k)
to properly free the clock source.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/t7l66xb.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 5041d33..006c121 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -350,7 +350,6 @@ static int t7l66xb_probe(struct platform_device *dev)
t7l66xb->clk48m = clk_get(&dev->dev, "CLK_CK48M");
if (IS_ERR(t7l66xb->clk48m)) {
ret = PTR_ERR(t7l66xb->clk48m);
- clk_put(t7l66xb->clk32k);
goto err_clk48m_get;
}
@@ -425,6 +424,8 @@ static int t7l66xb_remove(struct platform_device *dev)
ret = pdata->disable(dev);
clk_disable(t7l66xb->clk48m);
clk_put(t7l66xb->clk48m);
+ clk_disable(t7l66xb->clk32k);
+ clk_put(t7l66xb->clk32k);
t7l66xb_detach_irq(dev);
iounmap(t7l66xb->scr);
release_resource(&t7l66xb->rscr);
--
1.5.4.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] t7l66xb: properly free clk32k clock source
2010-07-01 9:43 [PATCH] t7l66xb: properly free clk32k clock source Axel Lin
@ 2010-07-02 15:16 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2010-07-02 15:16 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Magnus Damm, H Hartley Sweeten, Julia Lawall, Tejun Heo
Hi Alex,
On Thu, Jul 01, 2010 at 05:43:50PM +0800, Axel Lin wrote:
> This patch includes below fixes to properly free clk32k clock source:
> 1. remove a redundant clk_put in t7l66xb_probe error path
> 2. add missing clk_disable(t7l66xb->clk32k) and clk_put(t7l66xb->clk32k)
> to properly free the clock source.
Patch applied to my for-next branch. This almost looks like 2.6.35 material
though.
Cheers,
Samuel.
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/mfd/t7l66xb.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
> index 5041d33..006c121 100644
> --- a/drivers/mfd/t7l66xb.c
> +++ b/drivers/mfd/t7l66xb.c
> @@ -350,7 +350,6 @@ static int t7l66xb_probe(struct platform_device *dev)
> t7l66xb->clk48m = clk_get(&dev->dev, "CLK_CK48M");
> if (IS_ERR(t7l66xb->clk48m)) {
> ret = PTR_ERR(t7l66xb->clk48m);
> - clk_put(t7l66xb->clk32k);
> goto err_clk48m_get;
> }
>
> @@ -425,6 +424,8 @@ static int t7l66xb_remove(struct platform_device *dev)
> ret = pdata->disable(dev);
> clk_disable(t7l66xb->clk48m);
> clk_put(t7l66xb->clk48m);
> + clk_disable(t7l66xb->clk32k);
> + clk_put(t7l66xb->clk32k);
> t7l66xb_detach_irq(dev);
> iounmap(t7l66xb->scr);
> release_resource(&t7l66xb->rscr);
> --
> 1.5.4.3
>
>
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-02 15:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-01 9:43 [PATCH] t7l66xb: properly free clk32k clock source Axel Lin
2010-07-02 15:16 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome