* [PATCH] pxa168fb: Fix the function used to release some memory in an error handling path
@ 2019-08-31 10:00 Christophe JAILLET
2019-09-02 9:10 ` Lubomir Rintel
0 siblings, 1 reply; 3+ messages in thread
From: Christophe JAILLET @ 2019-08-31 10:00 UTC (permalink / raw)
To: b.zolnierkie, lkundrak, yuehaibing
Cc: dri-devel, linux-fbdev, linux-kernel, kernel-janitors,
Christophe JAILLET
In the probe function, some resources are allocated using 'dma_alloc_wc()',
they should be released with 'dma_free_wc()', not 'dma_free_coherent()'.
We already use 'dma_free_wc()' in the remove function, but not in the
error handling path of the probe function.
Also, remove a useless 'PAGE_ALIGN()'. 'info->fix.smem_len' is already
PAGE_ALIGNed.
Fixes: 638772c7553f ("fb: add support of LCD display controller on pxa168/910 (base layer)")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
The change about PAGE_ALIGN should probably be part of a separate commit.
However, git history for this driver is really quiet. If you think it
REALLY deserves a separate patch, either split it by yourself or axe this
part of the patch. I won't bother resubmitting for this lonely cleanup.
Hoping for your understanding.
---
drivers/video/fbdev/pxa168fb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c
index 1410f476e135..1fc50fc0694b 100644
--- a/drivers/video/fbdev/pxa168fb.c
+++ b/drivers/video/fbdev/pxa168fb.c
@@ -766,8 +766,8 @@ static int pxa168fb_probe(struct platform_device *pdev)
failed_free_clk:
clk_disable_unprepare(fbi->clk);
failed_free_fbmem:
- dma_free_coherent(fbi->dev, info->fix.smem_len,
- info->screen_base, fbi->fb_start_dma);
+ dma_free_wc(fbi->dev, info->fix.smem_len,
+ info->screen_base, fbi->fb_start_dma);
failed_free_info:
kfree(info);
@@ -801,7 +801,7 @@ static int pxa168fb_remove(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0);
- dma_free_wc(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
+ dma_free_wc(fbi->dev, info->fix.smem_len,
info->screen_base, info->fix.smem_start);
clk_disable_unprepare(fbi->clk);
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] pxa168fb: Fix the function used to release some memory in an error handling path
2019-08-31 10:00 [PATCH] pxa168fb: Fix the function used to release some memory in an error handling path Christophe JAILLET
@ 2019-09-02 9:10 ` Lubomir Rintel
2020-01-03 12:00 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 3+ messages in thread
From: Lubomir Rintel @ 2019-09-02 9:10 UTC (permalink / raw)
To: Christophe JAILLET, b.zolnierkie, yuehaibing
Cc: dri-devel, linux-fbdev, linux-kernel, kernel-janitors
On Sat, 2019-08-31 at 12:00 +0200, Christophe JAILLET wrote:
> In the probe function, some resources are allocated using 'dma_alloc_wc()',
> they should be released with 'dma_free_wc()', not 'dma_free_coherent()'.
>
> We already use 'dma_free_wc()' in the remove function, but not in the
> error handling path of the probe function.
>
> Also, remove a useless 'PAGE_ALIGN()'. 'info->fix.smem_len' is already
> PAGE_ALIGNed.
>
> Fixes: 638772c7553f ("fb: add support of LCD display controller on pxa168/910 (base layer)")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Lubomir Rintel <lkundrak@v3.sk>
Thanks,
Lubo
> ---
> The change about PAGE_ALIGN should probably be part of a separate commit.
> However, git history for this driver is really quiet. If you think it
> REALLY deserves a separate patch, either split it by yourself or axe this
> part of the patch. I won't bother resubmitting for this lonely cleanup.
> Hoping for your understanding.
> ---
> drivers/video/fbdev/pxa168fb.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c
> index 1410f476e135..1fc50fc0694b 100644
> --- a/drivers/video/fbdev/pxa168fb.c
> +++ b/drivers/video/fbdev/pxa168fb.c
> @@ -766,8 +766,8 @@ static int pxa168fb_probe(struct platform_device *pdev)
> failed_free_clk:
> clk_disable_unprepare(fbi->clk);
> failed_free_fbmem:
> - dma_free_coherent(fbi->dev, info->fix.smem_len,
> - info->screen_base, fbi->fb_start_dma);
> + dma_free_wc(fbi->dev, info->fix.smem_len,
> + info->screen_base, fbi->fb_start_dma);
> failed_free_info:
> kfree(info);
>
> @@ -801,7 +801,7 @@ static int pxa168fb_remove(struct platform_device *pdev)
>
> irq = platform_get_irq(pdev, 0);
>
> - dma_free_wc(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
> + dma_free_wc(fbi->dev, info->fix.smem_len,
> info->screen_base, info->fix.smem_start);
>
> clk_disable_unprepare(fbi->clk);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] pxa168fb: Fix the function used to release some memory in an error handling path
2019-09-02 9:10 ` Lubomir Rintel
@ 2020-01-03 12:00 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2020-01-03 12:00 UTC (permalink / raw)
To: Lubomir Rintel, Christophe JAILLET
Cc: yuehaibing, dri-devel, linux-fbdev, linux-kernel, kernel-janitors
On 9/2/19 11:10 AM, Lubomir Rintel wrote:
> On Sat, 2019-08-31 at 12:00 +0200, Christophe JAILLET wrote:
>> In the probe function, some resources are allocated using 'dma_alloc_wc()',
>> they should be released with 'dma_free_wc()', not 'dma_free_coherent()'.
>>
>> We already use 'dma_free_wc()' in the remove function, but not in the
>> error handling path of the probe function.
>>
>> Also, remove a useless 'PAGE_ALIGN()'. 'info->fix.smem_len' is already
>> PAGE_ALIGNed.
>>
>> Fixes: 638772c7553f ("fb: add support of LCD display controller on pxa168/910 (base layer)")
>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>
> Reviewed-by: Lubomir Rintel <lkundrak@v3.sk>
Thanks, patch queued for v5.6 (also sorry for the delay).
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
> Thanks,
> Lubo
>
>> ---
>> The change about PAGE_ALIGN should probably be part of a separate commit.
>> However, git history for this driver is really quiet. If you think it
>> REALLY deserves a separate patch, either split it by yourself or axe this
>> part of the patch. I won't bother resubmitting for this lonely cleanup.
>> Hoping for your understanding.
>> ---
>> drivers/video/fbdev/pxa168fb.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c
>> index 1410f476e135..1fc50fc0694b 100644
>> --- a/drivers/video/fbdev/pxa168fb.c
>> +++ b/drivers/video/fbdev/pxa168fb.c
>> @@ -766,8 +766,8 @@ static int pxa168fb_probe(struct platform_device *pdev)
>> failed_free_clk:
>> clk_disable_unprepare(fbi->clk);
>> failed_free_fbmem:
>> - dma_free_coherent(fbi->dev, info->fix.smem_len,
>> - info->screen_base, fbi->fb_start_dma);
>> + dma_free_wc(fbi->dev, info->fix.smem_len,
>> + info->screen_base, fbi->fb_start_dma);
>> failed_free_info:
>> kfree(info);
>>
>> @@ -801,7 +801,7 @@ static int pxa168fb_remove(struct platform_device *pdev)
>>
>> irq = platform_get_irq(pdev, 0);
>>
>> - dma_free_wc(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
>> + dma_free_wc(fbi->dev, info->fix.smem_len,
>> info->screen_base, info->fix.smem_start);
>>
>> clk_disable_unprepare(fbi->clk);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-03 12:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-31 10:00 [PATCH] pxa168fb: Fix the function used to release some memory in an error handling path Christophe JAILLET
2019-09-02 9:10 ` Lubomir Rintel
2020-01-03 12:00 ` Bartlomiej Zolnierkiewicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).