lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 047/237] pxa168fb: Fix the function used to release some memory in an error handling path
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 3c911fe799d1c338d94b78e7182ad452c37af897 ]

    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>
    CC: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20190831100024.3248-1-christophe.jaillet@wanadoo.fr
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 d059d04c63acd..20195d3dbf088 100644
    --- a/drivers/video/fbdev/pxa168fb.c
    +++ b/drivers/video/fbdev/pxa168fb.c
    @@ -769,8 +769,8 @@ failed_free_cmap:
    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);

    @@ -804,7 +804,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


    \
     
     \ /
      Last update: 2020-02-27 15:40    [W:4.129 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site