lkml.org 
[lkml]   [2013]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 2/2] i2c: pxa: no need release_mem_region before request_mem_region successful
Hi libo,

On 05/06/2013 09:11 PM, Libo Chen wrote:

>
> move release_mem_region above kfree(i2c) && below clk_put(i2c->clk)
>
> Signed-off-by: Libo Chen <libo.chen@huawei.com>
> ---
> drivers/i2c/busses/i2c-pxa.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
> index ea6d45d..3188cd0 100644
> --- a/drivers/i2c/busses/i2c-pxa.c
> +++ b/drivers/i2c/busses/i2c-pxa.c
> @@ -1129,7 +1129,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
> i2c->clk = clk_get(&dev->dev, NULL);
> if (IS_ERR(i2c->clk)) {
> ret = PTR_ERR(i2c->clk);
> - goto eclk;
> + goto emm;

The new tag 'emm' seems not suitable here, keep the original 'eclk' here, modify the upper 'eclk' tags instead:
...
ret = i2c_pxa_probe_dt(dev, i2c, &i2c_type);
if (ret > 0)
ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type);
if (ret < 0)
- goto eclk;
+ goto etype;

res = platform_get_resource(dev, IORESOURCE_MEM, 0);
irq = platform_get_irq(dev, 0);
if (res == NULL || irq < 0) {
ret = -ENODEV;
- goto eclk;
+ goto edev;
}

if (!request_mem_region(res->start, resource_size(res), res->name)) {
ret = -ENOMEM;
- goto eclk;
+ goto emem;
}
...

> }
>
> i2c->reg_base = ioremap(res->start, resource_size(res));
> @@ -1206,10 +1206,11 @@ ereqirq:
> iounmap(i2c->reg_base);
> eremap:
> clk_put(i2c->clk);
> +emm:
> + release_mem_region(res->start, resource_size(res));
> eclk:
> kfree(i2c);

eclk:
release_mem_region(res->start, resource_size(res));
etype:
edev:
emem:
kfree(i2c);

> emalloc:
> - release_mem_region(res->start, resource_size(res));
> return ret;
> }
>

Thanks,
Gu


\
 
 \ /
  Last update: 2013-05-07 05:41    [W:0.079 / U:0.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site