Commit 6ca731e5 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman

pxa168fb: Fix the function used to release some memory in an error handling path

[ Upstream commit 3c911fe7 ]

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: 638772c7 ("fb: add support of LCD display controller on pxa168/910 (base layer)")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarLubomir Rintel <lkundrak@v3.sk>
CC: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190831100024.3248-1-christophe.jaillet@wanadoo.frSigned-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 86ddd143
...@@ -769,8 +769,8 @@ static int pxa168fb_probe(struct platform_device *pdev) ...@@ -769,8 +769,8 @@ static int pxa168fb_probe(struct platform_device *pdev)
failed_free_clk: failed_free_clk:
clk_disable_unprepare(fbi->clk); clk_disable_unprepare(fbi->clk);
failed_free_fbmem: failed_free_fbmem:
dma_free_coherent(fbi->dev, info->fix.smem_len, dma_free_wc(fbi->dev, info->fix.smem_len,
info->screen_base, fbi->fb_start_dma); info->screen_base, fbi->fb_start_dma);
failed_free_info: failed_free_info:
kfree(info); kfree(info);
...@@ -804,7 +804,7 @@ static int pxa168fb_remove(struct platform_device *pdev) ...@@ -804,7 +804,7 @@ static int pxa168fb_remove(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0); 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); info->screen_base, info->fix.smem_start);
clk_disable_unprepare(fbi->clk); clk_disable_unprepare(fbi->clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment